Merge branch 'gb/maint-am-patch-format-error-message' into maint

* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch
2011-09-23 14:11:18 -07:00 · 2011-09-23 14:11:18 -07:00 · 40ffc49876
parent e622f41dcd dff4b0ef30
commit 40ffc49876
1 changed files with 2 additions and 1 deletions
--- a/git-am.sh
+++ b/git-am.sh
@ -305,7 +305,8 @@ split_patches () {
 		msgnum=
 		;;
 	*)
-		if test -n "$parse_patch" ; then
+		if test -n "$patch_format"
+		then
 			clean_abort "Patch format $patch_format is not supported."
 		else
 			clean_abort "Patch format detection failed."