am: format is in $patch_format, not parse_patch
The error message given when the patch format was not recognized was wrong, since the variable checked was $parse_patch rather than $patch_format. Fix by checking the non-emptyness of the correct variable. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
46caf5053f
commit
dff4b0ef30
@ -268,7 +268,8 @@ split_patches () {
|
|||||||
msgnum=
|
msgnum=
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
if test -n "$parse_patch" ; then
|
if test -n "$patch_format"
|
||||||
|
then
|
||||||
clean_abort "Patch format $patch_format is not supported."
|
clean_abort "Patch format $patch_format is not supported."
|
||||||
else
|
else
|
||||||
clean_abort "Patch format detection failed."
|
clean_abort "Patch format detection failed."
|
||||||
|
Loading…
Reference in New Issue
Block a user