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

* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch Conflicts: git-am.sh
2011-09-02 13:18:07 -07:00
parent c33e30675b dff4b0ef30
commit e7734c6c9b
2 changed files with 15 additions and 1 deletions
--- a/git-am.sh
+++ b/git-am.sh
@ -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.")"