summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorLibravatar Giuseppe Bilotta <giuseppe.bilotta@gmail.com>2011-08-29 17:22:06 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-29 09:07:54 -0700
commitdff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3 (patch)
treebbee0c8d50c8ce92c9654d9c8d8972ad71699189 /git-am.sh
parentgit-am: print fair error message when format detection fails (diff)
downloadtgif-dff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3.tar.xz
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index f719f6e654..78e3ee039f 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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."