X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-am.sh;h=f5afe1562af869a3d84197913e14667b9ce729c0;hb=36612e4daf8b5b5eaf16315aa13c66925f878cd6;hp=f1a03c912824a264cbe29905d53e2fe58c2c9dd6;hpb=1f2705e20fa5f2d3c93663296eef723f45d1fa41;p=git.git diff --git a/git-am.sh b/git-am.sh index f1a03c912..f5afe1562 100755 --- 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."