Uncommited changes synced

[gitlive] / GitBranch.vala

diff --git a/GitBranch.vala b/GitBranch.vala
index e092430..e996492 100644 (file)
--- a/GitBranch.vala
+++ b/GitBranch.vala
@@ -90,9 +90,15 @@ public class GitBranch : Object
                 
                var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
                while (r.next()) {
+               
+
+               
                        var br = new GitBranch(repo);
                        var gbr = r.get() as Ggit.Branch;
-
+                       if (!gbr.is_branch()) {
+                               continue;
+                       }
+                       
                        br.active = gbr.is_head();
                        br.name = gbr.get_name();
                        br.lastrev = gbr.get_target().to_string();
@@ -143,7 +149,11 @@ public class GitBranch : Object
                                continue;
                        }
                        // not clear how to do this yet...
-                       repo.git(  { "branch" ,"--track" , rn,  "origin/" + rn} ); 
+                       try {
+                               repo.git(  { "branch" ,"--track" , rn,  "origin/" + rn} ); 
+                       } catch (Error e) {
+                               continue; // allow failure?
+                       }
                        var br = new GitBranch(repo);
                        br.name = rn;
                        br.lastrev = ""; // it's behind