Commit 40ffc498 authored by Junio C Hamano's avatar Junio C Hamano

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
parents e622f41d dff4b0ef
......@@ -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."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment