summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 46caf50)
raw | patch | inline | side by side (parent: 46caf50)
author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | |
Mon, 29 Aug 2011 15:22:06 +0000 (17:22 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Mon, 29 Aug 2011 16:07:54 +0000 (09:07 -0700) |
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>
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>
git-am.sh | patch | blob | history |
diff --git a/git-am.sh b/git-am.sh
index f719f6e654fdb7ee92013c824af439b5f0f58f95..78e3ee039f921a0ae5d121340153fee93ab45154 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
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."