Skip to content

Commit

Permalink
am: format is in $patch_format, not parse_patch
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Giuseppe Bilotta authored and Junio C Hamano committed Aug 29, 2011
1 parent 46caf50 commit dff4b0e
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,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."
Expand Down

0 comments on commit dff4b0e

Please sign in to comment.