fix unmerging ;) master
authorRudolf Polzer <divverent@alientrap.org>
Fri, 24 Sep 2010 20:09:48 +0000 (22:09 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 24 Sep 2010 20:09:48 +0000 (22:09 +0200)
git-branch-manager

index 631e0dd..0fd6938 100755 (executable)
@@ -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: $!";