X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=GitBranch.vala;h=e9964922c156b7a133061bdb9b643b1734dafc0f;hb=01af28a18150e1c30fd20ef32da736c7ceee80ef;hp=e092430b94474ce3b96c67fdbc763bf7b8d782b6;hpb=2eb32b1bbe5ff712768821d66e98211b44b3c5bb;p=gitlive

diff --git a/GitBranch.vala b/GitBranch.vala
index e092430b..e9964922 100644
--- 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