Skip to content

Commit

Permalink
git-am: print fair error message when format detection fails
Browse files Browse the repository at this point in the history
Avoid git ending with this message:
	"Patch format  is not supported."

With improved error message in the format detection failure case by
Giuseppe Bilotta.

Signed-off-by: Nicolas Sebrecht <ni.s@laposte.net>
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Nicolas Sebrecht authored and Junio C Hamano committed Aug 10, 2009
1 parent 584c435 commit af12fb7
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion git-am.sh
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,11 @@ split_patches () {
msgnum=
;;
*)
clean_abort "Patch format $patch_format is not supported."
if test -n "$parse_patch" ; then
clean_abort "Patch format $patch_format is not supported."
else
clean_abort "Patch format detection failed."
fi
;;
esac
}
Expand Down

0 comments on commit af12fb7

Please sign in to comment.