From: Alan Knowles <alan@roojs.com>
Date: Mon, 5 Nov 2018 08:04:57 +0000 (+0800)
Subject: sync with changes
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=1245856c12bd5161158d057fc603ae5f4b0dfcee

sync with changes
---

diff --git a/GitRepo.vala b/GitRepo.vala
index dafecc6e..034d535c 100644
--- 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)
     {
@@ -372,6 +370,8 @@ public class GitRepo : Object
 					   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"  };