All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: Philippe Blain <levraiphilippeblain@gmail.com>,
	Git List <git@vger.kernel.org>,
	pudinha <rogi@skylittlesystem.org>
Subject: Re: [BUG] Regression in 'git mergetool --tool-help'
Date: Sat, 19 Dec 2020 09:13:19 -0800	[thread overview]
Message-ID: <xmqqsg81pvm8.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <5fddeda8a5a92_1de0de2088a@natae.notmuch> (Felipe Contreras's message of "Sat, 19 Dec 2020 06:10:16 -0600")

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

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


  reply	other threads:[~2020-12-19 17:14 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-19  4:23 [BUG] Regression in 'git mergetool --tool-help' Philippe Blain
2020-12-19  4:50 ` Felipe Contreras
2020-12-19  5:33   ` Junio C Hamano
2020-12-19 12:10     ` Felipe Contreras
2020-12-19 17:13       ` Junio C Hamano [this message]
2020-12-20  2:13         ` Philippe Blain
2020-12-20 10:28           ` Johannes Sixt
2020-12-20 16:23             ` René Scharfe
2020-12-20 18:11               ` Junio C Hamano
2020-12-20 23:47               ` Philippe Blain
2020-12-21  0:41                 ` Junio C Hamano
2020-12-20 15:34           ` Junio C Hamano
2020-12-19  5:16 ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqsg81pvm8.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=levraiphilippeblain@gmail.com \
    --cc=rogi@skylittlesystem.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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.