Re: [BUG] Regression in 'git mergetool --tool-help'

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 19, 2020, 17:13 UTC
Message-ID: <xmqqsg81pvm8.fsf@gitster.c.googlers.com>
In-Reply-To: <5fddeda8a5a92_1de0de2088a@natae.notmuch>

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 21 quoted lines

> Junio C Hamano wrote:
>> Felipe Contreras <felipe.contreras@gmail.com> writes:
>> > How about this?
>> >
>> > --- a/git-mergetool--lib.sh
>> > +++ b/git-mergetool--lib.sh
>> > @@ -46,7 +46,7 @@ show_tool_names () {
>> >                 while read scriptname
>> >                 do
>> >                         setup_tool "$scriptname" 2>/dev/null
>> > -                       variants="$variants$(list_tool_variants)\n"
>> > +                       variants="$variants$(list_tool_variants)"$'\n'
>> >                 done
>> >                 variants="$(echo "$variants" | sort | uniq)"
>> 
>> Ah, I didn't see your variant before sending mine.  $'\n' would work
>> with bash but we prefer not to rely on bashisms here.
>
> Yeah, but it's not even an RFC/PATCH. It's not proposed as a solution.
>
> It's just to focus the eyes of the relevant parties on the likely issue.

I think that served its purpose well, especially as the message went to the original contributor CC'ed. I improved on it by mentioning that we do not welcome $'\n', in case the original contributor did not know it and blindly took the suggestion.

Thanks.