GitBranch.vala
authorAlan Knowles <alan@roojs.com>
Wed, 20 Mar 2019 10:40:32 +0000 (18:40 +0800)
committerAlan Knowles <alan@roojs.com>
Wed, 20 Mar 2019 10:40:32 +0000 (18:40 +0800)
GitBranch.vala

index 20e36fd..e092430 100644 (file)
@@ -138,6 +138,10 @@ public class GitBranch : Object
                        if (remotes_used.get(rn)) {
                                continue;
                        }
+                       if (repo.branches.has_key(rn)) {
+                               GLib.debug("skip tracking branch - same name exists?");
+                               continue;
+                       }
                        // not clear how to do this yet...
                        repo.git(  { "branch" ,"--track" , rn,  "origin/" + rn} ); 
                        var br = new GitBranch(repo);