projects
/
gitlive
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b665a27
)
sync with changes
author
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 08:02:32 +0000
(16:02 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 5 Nov 2018 08:02:32 +0000
(16:02 +0800)
GitRepo.vala
patch
|
blob
|
history
diff --git
a/GitRepo.vala
b/GitRepo.vala
index
0cc1e50
..
dafecc6
100644
(file)
--- a/
GitRepo.vala
+++ b/
GitRepo.vala
@@
-258,10
+258,9
@@
public class GitRepo : Object
var ret = "";
if (action == "CLOSE" || action == "LEAVE") {
var ret = "";
if (action == "CLOSE" || action == "LEAVE") {
-
try {
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 };
string [] cmd = { "merge", "--squash", oldbranch };
this.git( cmd );
cmd = { "commit", "-a" , "-m", commit_message };
@@
-370,8
+369,10
@@
public class GitRepo : Object
}
try {
}
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);
} catch(Error e) {
string[] cmd = { "checkout", "master" };
this.git(cmd);