X-Git-Url: http://git.roojs.org/?p=gitlive;a=blobdiff_plain;f=GitRepo.vala;h=6108c1eebf7dbd66f0fe24e2c129515917d3c2f3;hp=17556aedcb3e906d27d30f25d51ba8969c2eb529;hb=55d94ffcc22b705da1d4149afd5d4cfb453136ba;hpb=f93028e569039b48af6351e2d37f80d15d94ff5a

diff --git a/GitRepo.vala b/GitRepo.vala
index 17556aed..6108c1ee 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -349,13 +349,13 @@ public class GitRepo : Object
     public bool createBranchNamed(string branchname)
     { 	
 		
-
+			var stash = false;
 		     if (this.branches.has_key(branchname)) {
 		     	// this is where it get's tricky...
 				try {		     	
 					 	string[] cmd = { "ls-files" ,  "-m" };		     	 // list the modified files..
 					    var ret = this.git(cmd);
-					    var stash = ret.length> 1 ;
+					    stash = ret.length> 1 ;
 					    
 					 	
 					    cmd = { "stash" };		     	
@@ -369,13 +369,13 @@ public class GitRepo : Object
 				
 				  }
 				  try {
-				     cmd = { "merge", "master"  };
+				     string[] cmd = { "merge", "master"  };
 					    this.git(cmd);
 				   } catch(Error e) {
 					   	try {
-	   					    cmd = { "mergetool" };
+	   					    string[] cmd = { "mergetool" };
 							this.git(cmd);
-	   					    cmd = { "commit" "-m" "Fix merge conflicts from master" };
+	   					    cmd = { "commit",  "-m" , "Fix merge conflicts from master" };
 							this.git(cmd);
 						} catch(Error ee) {
 					 		GitMonitor.gitmonitor.pauseError(ee.message);
@@ -383,7 +383,7 @@ public class GitRepo : Object
 				 		}
 			 		}
 				  try {					
-					    cmd = { "stash", "pop"  };
+					   string[]  cmd = { "stash", "pop"  };
 					    if (stash) { this.git(cmd); }
 					} catch(Error ee) {
 				 		GitMonitor.gitmonitor.pauseError(ee.message);
@@ -413,11 +413,7 @@ public class GitRepo : Object
                notification.show();   
        
 		    
-	    } catch(Error e) {
-	     	GitMonitor.gitmonitor.pauseError(e.message);
-    	 return false;	     	
 	    
-	    }
     	 this.loadBranches(); // update branch list...
     	 GitMonitor.gitmonitor.runQueue(); // commit any outstanding...
     	 return true;