fix: set upstream branch for existing remote branch

#224 (comment)
denolehov · Aug 28, 2022 · c454b9d · c454b9d
1 parent 91f8446
commit c454b9d
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/simpleGit.ts b/src/simpleGit.ts
@@ -380,7 +380,20 @@ export class SimpleGit extends GitManager {
     }
 
     async updateUpstreamBranch(remoteBranch: string) {
-        await this.git.push(["--set-upstream", ...remoteBranch.split("/")], (err) => this.onError(err));
+        try {
+            // git 1.8+
+            await this.git.branch(['--set-upstream-to', remoteBranch]);
+        } catch (e) {
+            console.error(e);
+            try {
+                // git 1.7 - 1.8
+                await this.git.branch(['--set-upstream', remoteBranch]);
+            } catch (e) {
+                console.error(e);
+                // fallback
+                await this.git.push(["--set-upstream", ...remoteBranch.split("/")], (err) => this.onError(err));
+            }
+        }
 
     }