git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 21, 2020, 00:41 UTC
Message-ID
<xmqqpn34m1n0.fsf@gitster.c.googlers.com>
In-Reply-To
<2e7485b6-86d9-4de2-a823-dd84fc7386b0@gmail.com>
Philippe Blain <levraiphilippeblain@gmail.com> writes:
Show 6 quoted lines
> 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.
Previous: Philippe BlainNext: Junio C Hamano
Message 11 of 13 in “[BUG] Regression in 'git mergetool --tool-help'”
  1. Philippe BlainDec 19, 2020
  2. Felipe ContrerasDec 19, 2020
  3. Junio C HamanoDec 19, 2020
  4. Felipe ContrerasDec 19, 2020
  5. Junio C HamanoDec 19, 2020
  6. Philippe BlainDec 20, 2020
  7. Johannes SixtDec 20, 2020
  8. René ScharfeDec 20, 2020
  9. Junio C HamanoDec 20, 2020
  10. Philippe BlainDec 20, 2020
  11. Junio C HamanoDec 21, 2020
  12. Junio C HamanoDec 20, 2020
  13. Junio C HamanoDec 19, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.