sync with changes

[gitlive] / GitRepo.vala

diff --git a/GitRepo.vala b/GitRepo.vala
index 0cc1e50..034d535 100644 (file)
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -247,9 +247,7 @@ public class GitRepo : Object
        }
        GitMonitor.gitmonitor.start();
     }
-    
-
-
+     
 
     public bool doMerge(string action, string ticket_id, string commit_message)
     {
@@ -258,10 +256,9 @@ public class GitRepo : Object
                   var ret = "";
                   if (action == "CLOSE" || action == "LEAVE") {
                                   
- 
                try {
-                       var oldbranch = this.currentBranch.name;
-                       this.setActiveTicket(null, "master");
+                   var oldbranch = this.currentBranch.name;
+                   this.setActiveTicket(null, "master");
                string [] cmd = { "merge",   "--squash",  oldbranch };
                this.git( cmd );
                 cmd = { "commit",   "-a" , "-m",  commit_message };
@@ -370,8 +367,12 @@ public class GitRepo : Object
                                
                                  }
                                  try {
-                                      string[] cmd = { "merge", "master"  };
-                                           this.git(cmd);
+                                          if (branchname != "master") {
+                                              string[] cmd = { "merge", "master"  };
+                                                   this.git(cmd);
+                                              cmd = { "commit",   "-a" , "-m",  commit_message };
+                                      this.git( cmd );
+                                           }
                                   } catch(Error e) {
                                            string[] cmd = { "checkout", "master"  };
                                            this.git(cmd);