projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c2df746
)
GitBranch.vala
author
Alan Knowles
<alan@roojs.com>
Wed, 20 Mar 2019 10:40:32 +0000
(18:40 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 20 Mar 2019 10:40:32 +0000
(18:40 +0800)
GitBranch.vala
patch
|
blob
|
history
diff --git
a/GitBranch.vala
b/GitBranch.vala
index
20e36fd
..
e092430
100644
(file)
--- a/
GitBranch.vala
+++ b/
GitBranch.vala
@@
-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);