summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-02 13:18:11 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-02 13:18:11 -0700
commitfee6bc5f031a9d18d09463d96d7df562d62438f7 (patch)
tree72f22d12f0b21d1057a9fea5d523143601f84db1 /git-am.sh
parente7734c6c9b04d78e970b8de4765cdebd984ec6e6 (diff)
parent45d51dc9695a52222fc900e3c7ae8b9ee66c3db7 (diff)
downloadgit-fee6bc5f031a9d18d09463d96d7df562d62438f7.tar.gz
Merge branch 'gb/maint-am-stgit-author-to-from-fix'
* gb/maint-am-stgit-author-to-from-fix: am: fix stgit patch mangling
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 745fda9cbd..016b5056eb 100755
--- 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 ;