handling of old branches

[gitlive] / GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index 17556ae..6108c1e 100644 (file)
--- 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;