Merge pull request #10 from KyrietS/master

Fixed #9 Refusing to fetch into current branch
s0 · Apr 5, 2020 · 1514fb5 · 1514fb5
2 parents 43169ff + f8386e7
commit 1514fb5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/action/dist/index.js b/action/dist/index.js
@@ -772,7 +772,7 @@ var writeToProcess = function (command, args, opts) { return new Promise(functio
                 // Clone the target repo
                 _e.sent();
                 // Fetch branch if it exists
-                return [4 /*yield*/, exec("git fetch origin " + config.branch + ":" + config.branch, { env: env, cwd: REPO_TEMP }).catch(function (err) {
+                return [4 /*yield*/, exec("git fetch -u origin " + config.branch + ":" + config.branch, { env: env, cwd: REPO_TEMP }).catch(function (err) {
                         var s = err.toString();
                         if (s.indexOf('Couldn\'t find remote ref') === -1) {
                             console.error('##[warning] Failed to fetch target branch, probably doesn\'t exist');

diff --git a/action/src/index.ts b/action/src/index.ts
@@ -258,7 +258,7 @@ const writeToProcess = (command: string, args: string[], opts: {env: { [id: stri
   });
 
   // Fetch branch if it exists
-  await exec(`git fetch origin ${config.branch}:${config.branch}`, { env, cwd: REPO_TEMP }).catch(err => {
+  await exec(`git fetch -u origin ${config.branch}:${config.branch}`, { env, cwd: REPO_TEMP }).catch(err => {
     const s = err.toString();
     if (s.indexOf('Couldn\'t find remote ref') === -1) {
       console.error('##[warning] Failed to fetch target branch, probably doesn\'t exist')