From dff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Mon, 29 Aug 2011 17:22:06 +0200 Subject: [PATCH] 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 Signed-off-by: Junio C Hamano --- git-am.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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." -- 2.11.4.GIT