* [PATCH] am: format is in $patch_format, not parse_patch
@ 2011-08-29 15:22 Giuseppe Bilotta
2011-08-29 16:12 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Giuseppe Bilotta @ 2011-08-29 15:22 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, Giuseppe Bilotta
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>
---
git-am.sh | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/git-am.sh b/git-am.sh
index e78cb54..4fff195 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -312,7 +312,7 @@ 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.")"
--
1.7.7.rc0.328.g626f7.dirty
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] am: format is in $patch_format, not parse_patch
2011-08-29 15:22 [PATCH] am: format is in $patch_format, not parse_patch Giuseppe Bilotta
@ 2011-08-29 16:12 ` Junio C Hamano
2011-08-29 16:46 ` Giuseppe Bilotta
0 siblings, 1 reply; 3+ messages in thread
From: Junio C Hamano @ 2011-08-29 16:12 UTC (permalink / raw)
To: Giuseppe Bilotta; +Cc: git
Giuseppe Bilotta <giuseppe.bilotta@gmail.com> writes:
> 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.
Thanks for a fix to a problem that is from more than two years ago ;-)
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] am: format is in $patch_format, not parse_patch
2011-08-29 16:12 ` Junio C Hamano
@ 2011-08-29 16:46 ` Giuseppe Bilotta
0 siblings, 0 replies; 3+ messages in thread
From: Giuseppe Bilotta @ 2011-08-29 16:46 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
On Mon, Aug 29, 2011 at 6:12 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Giuseppe Bilotta <giuseppe.bilotta@gmail.com> writes:
>
>> 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.
>
> Thanks for a fix to a problem that is from more than two years ago ;-)
You're welcome. I'm actually surprised that wasn't something _I_ did
by mistake ;-)
That part of the code isn't being stressed too much. I've just found
another issue. Patch coming, plus another enhancement.
--
Giuseppe "Oblomov" Bilotta
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-08-29 16:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-29 15:22 [PATCH] am: format is in $patch_format, not parse_patch Giuseppe Bilotta
2011-08-29 16:12 ` Junio C Hamano
2011-08-29 16:46 ` Giuseppe Bilotta
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.