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

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