X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=016b5056eb29fb24d06667c340ad372ed096d4dc;hb=559357b508847df5a5736ed7130f6bccab52d044;hp=e78cb547b7875ba68ddedbc507b7b0d7d0a50b31;hpb=67c116bb26b4ee31889e5ee15d6a9d3b7e972b7b;p=git.git

diff --git a/git-am.sh b/git-am.sh
index e78cb547b..016b5056e 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 ;
@@ -312,7 +312,8 @@ split_patches () {
 		msgnum=
 		;;
 	*)
-		if test -n "$parse_patch" ; then
+		if test -n "$patch_format"
+		then
 			clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
 		else
 			clean_abort "$(gettext "Patch format detection failed.")"