From: "René Scharfe" <l.s.r@web.de>
To: Johannes Sixt <j6t@kdbg.org>,
Philippe Blain <levraiphilippeblain@gmail.com>
Cc: Git List <git@vger.kernel.org>,
pudinha <rogi@skylittlesystem.org>,
Felipe Contreras <felipe.contreras@gmail.com>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [BUG] Regression in 'git mergetool --tool-help'
Date: Sun, 20 Dec 2020 17:23:26 +0100 [thread overview]
Message-ID: <a9e6f3aa-e88e-6cc2-fb16-c26bdd3bf4d3@web.de> (raw)
In-Reply-To: <568f42a0-f630-64ca-9f77-183dcaa56d1e@kdbg.org>
Am 20.12.20 um 11:28 schrieb Johannes Sixt:
> Am 20.12.20 um 03:13 schrieb Philippe Blain:
>> Thanks for both answers. Felipe's solution does the trick, but Junio's
>> does not;
>> it seems we do have to have a newline there. The following also works,
>> and I think
>> is portable:
>>
>> diff --git i/git-mergetool--lib.sh w/git-mergetool--lib.sh
>> index 2defef28cd..6f03975493 100644
>> --- i/git-mergetool--lib.sh
>> +++ w/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="$(echo "$variants" && list_tool_variants)"
>> done
>> variants="$(echo "$variants" | sort | uniq)"
>>
>> I figured out what was different between the different Ubuntu versions I
>> was testing:
>> the Ubuntu 14 and 18 systems have Bash as /bin/sh, but my Ubuntu 20 system
>> has /usr/bin/dash as /bin/sh (the default for Ubuntu these days).
>>
>> I'll try to send a formal patch with the diff above, time permitting...
>
> If possible, please do not use sub-processes like in your suggested
> patch. How about
>
> variants="$variants
> $(list_tool_variants)"
This still starts a subshell in the last line. How about something
like this?
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 7225abd811..79d5ed1fa9 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -46,11 +46,9 @@ show_tool_names () {
while read scriptname
do
setup_tool "$scriptname" 2>/dev/null
- variants="$variants$(list_tool_variants)\n"
- done
- variants="$(echo "$variants" | sort | uniq)"
-
- for toolname in $variants
+ list_tool_variants
+ done | sort | uniq |
+ while read toolname
do
if setup_tool "$toolname" 2>/dev/null &&
(eval "$condition" "$toolname")
It requires setup_tool to be silent, though.
> It leaves a blank line at the beginning of $variants instead of the end
> and should not make a difference in the outcome of
>
> variants="$(echo "$variants" | sort | uniq)"
>
> BTW, is `sort -u` not available everywhere?
It's used by the function mergetool_find_win32_cmd in the same file
and by several test scripts, so that shouldn't be a problem.
René
next prev parent reply other threads:[~2020-12-20 16:25 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 [this message]
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=a9e6f3aa-e88e-6cc2-fb16-c26bdd3bf4d3@web.de \
--to=l.s.r@web.de \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=j6t@kdbg.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 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).