]> git.xonotic.org Git - xonotic/div0-gittools.git/commitdiff
fix author email when unmerging
authorRudolf Polzer <divverent@alientrap.org>
Sat, 26 Mar 2011 18:51:51 +0000 (19:51 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 26 Mar 2011 18:51:51 +0000 (19:51 +0100)
git-branch-manager

index 2d319857a9024d2ef0e470442c09873601785af4..1ab7dda1759df5adefbf48b1c941af09493ecfcd 100755 (executable)
@@ -167,9 +167,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*(.*)/)
                        {