X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdiv0-gittools.git;a=blobdiff_plain;f=git-branch-manager;h=fe034027b0c14d143c8a3f83fb470ab7c38cc359;hp=f551155ccbadc7e12982cc340cc5418085197fcd;hb=10afee364458be691a69df189cbbc7995407e9a5;hpb=d7dbc151256644e2e4db3313b2fb199d6d6dbd70

diff --git a/git-branch-manager b/git-branch-manager
index f551155..fe03402 100755
--- a/git-branch-manager
+++ b/git-branch-manager
@@ -143,10 +143,6 @@ sub unmerge_commit($)
 		$logcache = undef;
 		my $msg = backtick 'git', 'log', '-1', '--pretty=fuller', $r
 			or die "git-log: $!";
-		my $cmsg = "";
-		my $author = "";
-		my $email = "";
-		my $date = "";
 		for(split /\n/, $msg)
 		{
 			if(/^Author:\s*(.*)/)
@@ -164,7 +160,7 @@ sub unmerge_commit($)
 		}
 		open my $fh, '>', '.commitmsg'
 			or die ">.commitmsg: $!";
-		print $fh "UNMERGE\n$cmsg" . "::stable-branch::merge=$r\n"
+		print $fh "UNMERGE\n$cmsg" . "::stable-branch::unmerge=$r\n"
 			or die ">.commitmsg: $!";
 		close $fh
 			or die ">.commitmsg: $!";