actions/mawesome
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: git pull strategy

Browse Source
This commit is contained in:
Simone Corsi
2021-01-16 12:45:29 +01:00
parent 3c3ab0a45f
commit edb4a38f6b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/git.ts
View File

@@ -15,6 +15,7 @@ export default new (class Git {
// Set config // Set config
this.config('user.name', 'GitHub Actions'); this.config('user.name', 'GitHub Actions');
this.config('user.email', 'actions@users.noreply.github.com'); this.config('user.email', 'actions@users.noreply.github.com');
this.config('pull.rebase', 'false');
// Update the origin // Update the origin
this.updateOrigin( this.updateOrigin(
@@ -53,7 +54,7 @@ export default new (class Git {
commit = (message: string) => this.exec(`commit -m "${message}"`); commit = (message: string) => this.exec(`commit -m "${message}"`);
pull = async () => { pull = async () => {
const args = ['pull']; const args = ['pull', 'origin', branch];
// Check if the repo is unshallow // Check if the repo is unshallow
if (await this.isShallow()) { if (await this.isShallow()) {