adk23333/github-pages-deploy-action
1
0
Fork 0
mirror of https://github.com/JamesIves/github-pages-deploy-action.git synced 2023-12-15 20:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

--rebase

Browse Source
This commit is contained in:
James Ives 2020-01-11 19:36:30 -05:00
parent ff25f6df47
commit 26eeb0b857
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/git.js
View File

@ -34,7 +34,7 @@ function init() {
yield util_1.execute(`git init`, constants_1.workspace); yield util_1.execute(`git init`, constants_1.workspace);
yield util_1.execute(`git config user.name ${constants_1.action.name}`, constants_1.workspace); yield util_1.execute(`git config user.name ${constants_1.action.name}`, constants_1.workspace);
yield util_1.execute(`git config user.email ${constants_1.action.email}`, constants_1.workspace); yield util_1.execute(`git config user.email ${constants_1.action.email}`, constants_1.workspace);
yield util_1.execute(`git pull ${constants_1.repositoryPath}`, constants_1.workspace); yield util_1.execute(`git pull --rebase ${constants_1.repositoryPath}`, constants_1.workspace);
} }
catch (error) { catch (error) {
core.setFailed(`There was an error initializing the repository: ${error}`); core.setFailed(`There was an error initializing the repository: ${error}`);

2
src/git.ts
View File

@ -22,7 +22,7 @@ export async function init(): Promise<any> {
await execute(`git init`, workspace); await execute(`git init`, workspace);
await execute(`git config user.name ${action.name}`, workspace); await execute(`git config user.name ${action.name}`, workspace);
await execute(`git config user.email ${action.email}`, workspace); await execute(`git config user.email ${action.email}`, workspace);
await execute(`git pull ${repositoryPath}`, workspace); await execute(`git pull --rebase ${repositoryPath}`, workspace);
} catch (error) { } catch (error) {
core.setFailed(`There was an error initializing the repository: ${error}`); core.setFailed(`There was an error initializing the repository: ${error}`);
} finally { } finally {