Merge branch 'gb/maint-am-stgit-author-to-from-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:11 +0000 (13:18 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2011 20:18:11 +0000 (13:18 -0700)
* gb/maint-am-stgit-author-to-from-fix:
  am: fix stgit patch mangling

git-am.sh

index 745fda9..016b505 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -295,7 +295,7 @@ split_patches () {
                        perl -ne 'BEGIN { $subject = 0 }
                                if ($subject > 1) { print ; }
                                elsif (/^\s+$/) { next ; }
-                               elsif (/^Author:/) { print s/Author/From/ ; }
+                               elsif (/^Author:/) { s/Author/From/ ; print ;}
                                elsif (/^(From|Date)/) { print ; }
                                elsif ($subject) {
                                        $subject = 2 ;