git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>
Cc: "René Scharfe" <l.s.r@web.de>, "Johannes Sixt" <j6t@kdbg.org>,
	"Git List" <git@vger.kernel.org>,
	pudinha <rogi@skylittlesystem.org>,
	"Felipe Contreras" <felipe.contreras@gmail.com>
Subject: Re: [BUG] Regression in 'git mergetool --tool-help'
Date: Sun, 20 Dec 2020 16:41:23 -0800	[thread overview]
Message-ID: <xmqqpn34m1n0.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <2e7485b6-86d9-4de2-a823-dd84fc7386b0@gmail.com> (Philippe Blain's message of "Sun, 20 Dec 2020 18:47:29 -0500")

Philippe Blain <levraiphilippeblain@gmail.com> writes:

> Thanks René and Johannes for two additional suggestions; both work correctly.
> Junio, I retried yours and verified my quoting and I confirm it does not work.
>
> I think I prefer René's suggestion.
>
> Thanks all,

I see what was wrong with my variant.

We force IFS to be LF and nothing else upfront, which defeats the
attempt to split $variants at SP and turn them into "one token per
line" with "printf '%s\n' $variants | ..."

In any case, I find René's variant easier to follow, too.  

Thanks, all.

  reply	other threads:[~2020-12-21  0:42 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
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 [this message]
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=xmqqpn34m1n0.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=j6t@kdbg.org \
    --cc=l.s.r@web.de \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).