X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=git-branch-manager;h=78a6d065255dbe03c6f92e1711a1843b8de3f9f4;hb=e75e5417890b00add887762e96e1b62db40edec3;hp=82720c987288ce649b4c76d2580d71c8dd998f82;hpb=cb82cb3db790713e8d0e769ba1ced31e480ec4ab;p=xonotic%2Fdiv0-gittools.git

diff --git a/git-branch-manager b/git-branch-manager
index 82720c9..78a6d06 100755
--- a/git-branch-manager
+++ b/git-branch-manager
@@ -137,7 +137,7 @@ sub reject_commit($)
 		}
 		open my $fh, '>', '.commitmsg'
 			or die ">.commitmsg: $!";
-		print $fh "$cmsg" . "::stable-branch::reject=$r\n"
+		print $fh "REJECT! $cmsg" . "::stable-branch::reject=$r\n"
 			or die ">.commitmsg: $!";
 		close $fh
 			or die ">.commitmsg: $!";
@@ -183,7 +183,7 @@ sub unreject_commit($)
 		}
 		open my $fh, '>', '.commitmsg'
 			or die ">.commitmsg: $!";
-		print $fh "$cmsg" . "::stable-branch::unreject=$r\n"
+		print $fh "UNREJECT! $cmsg" . "::stable-branch::unreject=$r\n"
 			or die ">.commitmsg: $!";
 		close $fh
 			or die ">.commitmsg: $!";
@@ -281,7 +281,7 @@ sub unmerge_commit($)
 		}
 		open my $fh, '>', '.commitmsg'
 			or die ">.commitmsg: $!";
-		print $fh "UNMERGE\n$cmsg" . "::stable-branch::unmerge=$r\n"
+		print $fh "UNMERGE! $cmsg" . "::stable-branch::unmerge=$r\n"
 			or die ">.commitmsg: $!";
 		close $fh
 			or die ">.commitmsg: $!";
@@ -320,7 +320,7 @@ sub rebase_log($$)
 		{
 			unshift @rlog, ['reject', $log->{order_a}[$_]];
 		}
-		elsif(!$log->{bitmap}[$_])
+		elsif($log->{bitmap}[$_] == 0)
 		{
 			unshift @rlog, ['unmerge', $log->{order_a}[$_]];
 		}