From ce0a9ed7cbde853bab1ba31d0a14fd0a73d7578c Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Tue, 27 Oct 2020 11:50:33 +0800
Subject: [PATCH] Uncommited changes synced

---
 GitBranch.vala | 24 ++++++++++++++----------
 GitRepo.vala   |  4 +++-
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/GitBranch.vala b/GitBranch.vala
index 6a2dfa13..a2ec3157 100644
--- a/GitBranch.vala
+++ b/GitBranch.vala
@@ -79,17 +79,21 @@ public class GitBranch : Object
 		
 		var rem = repo.repo.lookup_remote("origin");
 		var cb = new GitCallbacks(repo);
-		rem.connect(Ggit.Direction.FETCH, cb, null, null);
-		var remote_heads = rem.list();
-		foreach(var rh in remote_heads) {
-			var rn = rh.get_name();
-			if (!rn.has_prefix("refs/heads/")) {
-				continue;
-			}
-			remotes.set(rn.substring(11), rh.get_oid());
-			remotes_used.set(rn.substring(11), false);
+		try {
+			rem.connect(Ggit.Direction.FETCH, cb, null, null);
+			var remote_heads = rem.list();
+			foreach(var rh in remote_heads) {
+				var rn = rh.get_name();
+				if (!rn.has_prefix("refs/heads/")) {
+					continue;
+				}
+				remotes.set(rn.substring(11), rh.get_oid());
+				remotes_used.set(rn.substring(11), false);
 
-	  } 
+		  } 
+		} catch (Error e) {
+			GLib.debug("Failed to fetch remotes continuing on ");
+		}
 		
 		 
 		var r = repo.repo.enumerate_branches(Ggit.BranchType.LOCAL);
diff --git a/GitRepo.vala b/GitRepo.vala
index b9f4d375..fa5ce1a7 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -29,10 +29,12 @@ public class GitRepo : Object
     public GitBranch  _currentBranch;
     public GitBranch  getCurrentBranch() {
     	if (this._currentBranch == null) {
+    		Posix.usleep(100); // try and slow down branch loading    	
     		this.loadBranches();
+
     	}
     	if (this._currentBranch == null) {    	
-    		GLib.error("could not work out current branch?");
+    		GLib.error("could not work out current branch? : %s ",this.git_working_dir );
 		}
 		return this._currentBranch;
     }
-- 
2.39.2