diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-09-02 22:18:07 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-02 22:18:07 +0200 |
| commit | e7734c6c9b04d78e970b8de4765cdebd984ec6e6 (patch) | |
| tree | 5b82e7fdb271f0f414e56916bb5dd7d653ed2e93 /git-am.sh | |
| parent | Merge branch 'ms/daemon-timeout-is-in-seconds' (diff) | |
| parent | am: format is in $patch_format, not parse_patch (diff) | |
| download | git-e7734c6c9b04d78e970b8de4765cdebd984ec6e6.tar.xz git-e7734c6c9b04d78e970b8de4765cdebd984ec6e6.zip | |
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-x | git-am.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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.")" |