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

[git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index e78cb547b7875ba68ddedbc507b7b0d7d0a50b31..745fda9cbde1193975392b74374227a3655f0ac0 100755 (executable)
--- 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.")"