summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-08-29 18:44:07 +0200
committerJunio C Hamano <gitster@pobox.com>2011-08-29 09:51:44 -0700
commit45d51dc9695a52222fc900e3c7ae8b9ee66c3db7 (patch)
tree6bad10091e69e4b4d1cb032259cbc67ba7414f90
parentc574e683b587ee3c302317e4fa9c83cd4605cd82 (diff)
downloadgit-45d51dc9695a52222fc900e3c7ae8b9ee66c3db7.tar.gz
am: fix stgit patch mangling
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 0ff1f577a3..3afa92b85a 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -229,7 +229,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 ;