]> git.ipfire.org Git - thirdparty/git.git/commit
am: format is in $patch_format, not parse_patch
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>
Mon, 29 Aug 2011 15:22:06 +0000 (17:22 +0200)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Aug 2011 16:07:54 +0000 (09:07 -0700)
commitdff4b0ef30cd3f06e1f2383ce09f81b8da94d5b3
treebbee0c8d50c8ce92c9654d9c8d8972ad71699189
parent46caf5053f0a784911c66530928e6e4361a783f2
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>
git-am.sh