summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-09-02 13:18:07 -0700
committerJunio C Hamano <gitster@pobox.com>2011-09-02 13:18:07 -0700
commite7734c6c9b04d78e970b8de4765cdebd984ec6e6 (patch)
tree5b82e7fdb271f0f414e56916bb5dd7d653ed2e93 /git-am.sh
parentc33e30675b601d6707dc4022a8f64812509c7566 (diff)
parentdff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3 (diff)
downloadgit-e7734c6c9b04d78e970b8de4765cdebd984ec6e6.tar.gz
Merge branch 'gb/maint-am-patch-format-error-message'
* gb/maint-am-patch-format-error-message: am: format is in $patch_format, not parse_patch Conflicts: git-am.sh
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 e78cb547b7..745fda9cbd 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -312,7 +312,8 @@ split_patches () {
msgnum=
;;
*)
- if test -n "$parse_patch" ; then
+ if test -n "$patch_format"
+ then
clean_abort "$(eval_gettext "Patch format \$patch_format is not supported.")"
else
clean_abort "$(gettext "Patch format detection failed.")"