diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-23 14:11:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-23 14:11:18 -0700 |
| commit | 40ffc49876611150104102d59a35d865e4670bd7 (patch) | |
| tree | e341ca0e53f3824c2ab8d8a2dd2ef6fe6a7330d3 | |
| parent | git-mergetool: check return value from read (diff) | |
| parent | am: format is in $patch_format, not parse_patch (diff) | |
| download | tgif-40ffc49876611150104102d59a35d865e4670bd7.tar.xz | |
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
| -rwxr-xr-x | git-am.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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." |