fix unmerging in the branch manager

[xonotic/div0-gittools.git] / git-branch-manager

diff --git a/git-branch-manager b/git-branch-manager
index f551155ccbadc7e12982cc340cc5418085197fcd..fe034027b0c14d143c8a3f83fb470ab7c38cc359 100755 (executable)
--- 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: $!";
                $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*(.*)/)
                for(split /\n/, $msg)
                {
                        if(/^Author:\s*(.*)/)


@@ -164,7 +160,7 @@ sub unmerge_commit($)
                }
                open my $fh, '>', '.commitmsg'
                        or die ">.commitmsg: $!";
                }
                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: $!";
                        or die ">.commitmsg: $!";
                close $fh
                        or die ">.commitmsg: $!";