From: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Date: Mon, 29 Aug 2011 15:22:06 +0000 (+0200)
Subject: am: format is in $patch_format, not parse_patch
X-Git-Tag: v1.7.7-rc1~20^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3;p=git.git

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>
---

diff --git a/git-am.sh b/git-am.sh
index f719f6e65..78e3ee039 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."