From: Alan Knowles <alan@roojs.com>
Date: Tue, 15 Jan 2019 09:10:05 +0000 (+0800)
Subject: Uncommited changes synced
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=a18f1e6390db1502e8954fb7d692fbe5c5de3207

Uncommited changes synced
---

diff --git a/GitBranch.vala b/GitBranch.vala
index bd4be49d..84a83312 100644
--- a/GitBranch.vala
+++ b/GitBranch.vala
@@ -103,7 +103,7 @@ public class GitBranch : Object
 	            branches.get(lname).remote = rname;
             }
             
-            if (!branches.has_key(rname)) {
+            if (!branches.has_key(rname) || !branches.has_key(lname)  ) {
                     continue;
             }
             branches.get(lname).remoterev =  branches.get(rname).lastrev;
@@ -112,15 +112,22 @@ public class GitBranch : Object
             branches.get(rname).name = lname;
         }
         foreach(var br in branches.values) {
+        	GLib.debug("BRANCH:\n%s\n" , br.toString());
         	if (br.name.length > 0 || ! /^remotes\/origin\//.match(br.remote)) {
+        		GLib.debug("SKIP - track exists");
         		continue;
     		}
-    		var newname = br.remote.replace("/remotes/origin/","");
+    		var newname = br.remote.replace("remotes/origin/","");
     		if (branches.has_key(newname)) {
-    			continue;
+    			GLib.debug("SKIP - have branch already");
+        		continue;
 			}
-    		repo.get( { "branch" ,"--track", newname, "origin/" + newname} ); 
-        	//GLib.debug("BRANCH:\n%s\n" , br.toString());
+		    
+		 
+    		repo.git(  { "branch" ,"--track" , newname,  "origin/" + newname} ); 
+        	//
+        	br.name  = newname;
+        	local.set(br.name, br);
         }
         
         /*