Skip to content

Commit

Permalink
Merge branch 'gb/maint-am-patch-format-error-message' into maint
Browse files Browse the repository at this point in the history
* gb/maint-am-patch-format-error-message:
  am: format is in $patch_format, not parse_patch
  • Loading branch information
Junio C Hamano committed Sep 23, 2011
2 parents e622f41 + dff4b0e commit 40ffc49
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 @@ -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."
Expand Down

0 comments on commit 40ffc49

Please sign in to comment.