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

From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Dec 19, 2020, 12:10 UTC
Message-ID: <5fddeda8a5a92_1de0de2088a@natae.notmuch>
In-Reply-To: <xmqqczz6qs0p.fsf@gitster.c.googlers.com>

Junio C Hamano wrote:

Show 16 quoted lines

> 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.

-- 
Felipe Contreras