From a7c56bd8db80c18c34c08e2b6cc7cf4c8eca33d5 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 5 Nov 2018 16:02:32 +0800
Subject: [PATCH] sync with changes

---
 GitRepo.vala | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/GitRepo.vala b/GitRepo.vala
index 0cc1e50a..dafecc6e 100644
--- a/GitRepo.vala
+++ b/GitRepo.vala
@@ -258,10 +258,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 +369,10 @@ public class GitRepo : Object
 				
 				  }
 				  try {
-				       string[] cmd = { "merge", "master"  };
-					    this.git(cmd);
+					   if (branchname != "master") {
+					       string[] cmd = { "merge", "master"  };
+						    this.git(cmd);
+					    }
 				   } catch(Error e) {
    				   	    string[] cmd = { "checkout", "master"  };
 					    this.git(cmd);
-- 
2.39.2