From a9bbd53cf319453db35be76706a69221a1d4944b Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 24 Sep 2010 22:09:48 +0200 Subject: [PATCH] fix unmerging ;) --- git-branch-manager | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-branch-manager b/git-branch-manager index 631e0dd..0fd6938 100755 --- a/git-branch-manager +++ b/git-branch-manager @@ -159,9 +159,10 @@ sub unmerge_commit($) or die "git-log: $!"; for(split /\n/, $msg) { - if(/^Author:\s*(.*)/) + if(/^Author:\s*(.*) <(.*)>/) { $author = $1; + $email = $2; } elsif(/^AuthorDate:\s*(.*)/) { @@ -174,7 +175,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: $!"; -- 2.39.2