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
This commit is contained in:
Junio C Hamano 2011-09-23 14:11:18 -07:00
commit 40ffc49876

View File

@ -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."