Re: [PATCH 1/3] fixup! mergetool--lib: add functions for finding available tools
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 30, 2013, 20:23 UTC
- Message-ID
- <7vk3quju7t.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <2c7dec096455e6e43d2e9aa28668f69a26f3d5f9.1359575447.git.john@keeping.me.uk>
John Keeping <john@keeping.me.uk> writes:
> Signed-off-by: John Keeping <john@keeping.me.uk> > --- > git-mergetool--lib.sh | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-)
Thanks.
Show 13 quoted lines
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> index 25631cd..b6ed2fa 100644
> --- a/git-mergetool--lib.sh
> +++ b/git-mergetool--lib.sh
> @@ -34,9 +34,9 @@ show_tool_names () {
> then
> echo "$preamble"
> preamble=
> - shown_any=yes
> fi
> - printf "%s%s\n" "$per_line_prefix" "$tool"
> + shown_any=yes
> + printf "%s%s\n" "$per_line_prefix" "$toolname"Thanks for spotting s/tool/toolname/; does the change to shown_any matter, though?
Show 11 quoted lines
> fi
> done
> test -n "$shown_any"
> @@ -244,6 +244,7 @@ show_tool_help () {
>
> tab=' ' av_shown= unav_shown=
>
> + cmd_name=${TOOL_MODE}tool
> if show_tool_names 'mode_ok && is_available' "$tab$tab" \
> "$tool_opt may be set to one of the following:"
> then