diff options
author | Giuseppe Bilotta <giuseppe.bilotta@gmail.com> | 2011-08-29 17:22:06 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-08-29 09:07:54 -0700 |
commit | dff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3 (patch) | |
tree | bbee0c8d50c8ce92c9654d9c8d8972ad71699189 /git-am.sh | |
parent | 46caf5053f0a784911c66530928e6e4361a783f2 (diff) | |
download | git-dff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3.tar.gz |
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-x | git-am.sh | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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." |