Merge branch 'gb/maint-am-patch-format-error-message' into maint

* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch
git-mirror · Sep 23, 2011 · 40ffc49 · 40ffc49
2 parents e622f41 + dff4b0e
commit 40ffc49
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/git-am.sh b/git-am.sh
@@ -305,7 +305,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."