From: Junio C Hamano <gitster@pobox.com>
To: Denton Liu <liu.denton@gmail.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
David Aguilar <davvid@gmail.com>,
Jeff Hostetler <git@jeffhostetler.com>,
Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v3 6/6] difftool: fallback on merge.guitool
Date: Thu, 25 Apr 2019 12:10:54 +0900 [thread overview]
Message-ID: <xmqq36m6zsn5.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <f39b15efbd5c765953737f99aa032230f066c074.1556142510.git.liu.denton@gmail.com> (Denton Liu's message of "Wed, 24 Apr 2019 15:47:04 -0700")
Denton Liu <liu.denton@gmail.com> writes:
> @@ -734,8 +728,8 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
> if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
> die(_("--gui, --tool and --extcmd are mutually exclusive"));
>
> - if (use_gui_tool && diff_gui_tool && *diff_gui_tool)
> - setenv("GIT_DIFF_TOOL", diff_gui_tool, 1);
> + if (use_gui_tool)
> + setenv("GIT_MERGETOOL_GUI", "true", 1);
> else if (difftool_cmd) {
> if (*difftool_cmd)
> setenv("GIT_DIFF_TOOL", difftool_cmd, 1);
So unless difftool_cmd is given explicitly, we'll let the scripted
difftool--helper to let merge_tool=$(get_merge_tool) to pick the
tool, which will use the same logic you wrote in the step 2/6.
OK, that makes sense.
What was preventing the get_configured_merge_tool updated in step
2/6 from getting called in difftool was the exporting of
GIT_DIFF_TOOL we see abovethat was removed by this step.
Which also makes sense.
> diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
> index 107f31213d..ae90701a12 100755
> --- a/t/t7800-difftool.sh
> +++ b/t/t7800-difftool.sh
> @@ -279,11 +279,27 @@ test_expect_success 'difftool + mergetool config variables' '
> echo branch >expect &&
> git difftool --no-prompt branch >actual &&
> test_cmp expect actual &&
> + git difftool --gui --no-prompt branch >actual &&
> + test_cmp expect actual &&
>
> # set merge.tool to something bogus, diff.tool to test-tool
> test_config merge.tool bogus-tool &&
> test_config diff.tool test-tool &&
> git difftool --no-prompt branch >actual &&
> + test_cmp expect actual &&
> + git difftool --gui --no-prompt branch >actual &&
> + test_cmp expect actual &&
> +
> + # set merge.tool, diff.tool to something bogus, merge.guitool to test-tool
> + test_config diff.tool bogus-tool &&
> + test_config merge.guitool test-tool &&
> + git difftool --gui --no-prompt branch >actual &&
> + test_cmp expect actual &&
> +
> + # set merge.tool, diff.tool, merge.guitool to something bogus, diff.guitool to test-tool
> + test_config merge.guitool bogus-tool &&
> + test_config diff.guitool test-tool &&
> + git difftool --gui --no-prompt branch >actual &&
> test_cmp expect actual
> '
next prev parent reply other threads:[~2019-04-25 3:10 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 5:07 [PATCH 0/5] difftool and mergetool improvements Denton Liu
2019-04-22 5:07 ` [PATCH 1/5] t7610: add mergetool --gui tests Denton Liu
2019-04-22 5:07 ` [PATCH 2/5] mergetool: use get_merge_tool function Denton Liu
2019-04-22 7:07 ` Eric Sunshine
2019-04-22 8:35 ` Denton Liu
2019-04-22 5:07 ` [PATCH 3/5] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-22 5:07 ` [PATCH 4/5] difftool: make --gui, --tool and --extcmd exclusive Denton Liu
2019-04-22 7:03 ` Eric Sunshine
2019-04-22 5:07 ` [PATCH 5/5] difftool: fallback on merge.guitool Denton Liu
2019-04-22 18:18 ` Jeff Hostetler
2019-04-22 18:33 ` Denton Liu
2019-04-23 8:53 ` [PATCH v2 0/5] difftool and mergetool improvements Denton Liu
2019-04-23 8:53 ` [PATCH v2 1/5] t7610: add mergetool --gui tests Denton Liu
2019-04-24 7:07 ` Junio C Hamano
2019-04-23 8:54 ` [PATCH v2 2/5] mergetool: use get_merge_tool_guessed function Denton Liu
2019-04-24 7:27 ` Junio C Hamano
2019-04-23 8:54 ` [PATCH v2 3/5] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-23 8:54 ` [PATCH v2 4/5] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-23 8:54 ` [PATCH v2 5/5] difftool: fallback on merge.guitool Denton Liu
2019-04-24 22:46 ` [PATCH v3 0/6] difftool and mergetool improvements Denton Liu
2019-04-24 22:46 ` [PATCH v3 1/6] t7610: unsuppress output Denton Liu
2019-04-25 2:31 ` Junio C Hamano
2019-04-24 22:46 ` [PATCH v3 2/6] t7610: add mergetool --gui tests Denton Liu
2019-04-24 22:47 ` [PATCH v3 3/6] mergetool: use get_merge_tool function Denton Liu
2019-04-25 2:36 ` Junio C Hamano
2019-04-24 22:47 ` [PATCH v3 4/6] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-25 3:02 ` Junio C Hamano
2019-04-25 5:16 ` Denton Liu
2019-04-24 22:47 ` [PATCH v3 5/6] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-24 22:47 ` [PATCH v3 6/6] difftool: fallback on merge.guitool Denton Liu
2019-04-25 3:10 ` Junio C Hamano [this message]
2019-04-25 9:54 ` [PATCH v4 0/6] difftool and mergetool improvements Denton Liu
2019-04-25 9:54 ` [PATCH v4 1/6] t7610: unsuppress output Denton Liu
2019-04-25 9:54 ` [PATCH v4 2/6] t7610: add mergetool --gui tests Denton Liu
2019-04-25 9:54 ` [PATCH v4 3/6] mergetool: use get_merge_tool function Denton Liu
2019-04-28 23:52 ` David Aguilar
2019-04-25 9:54 ` [PATCH v4 4/6] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-28 23:56 ` David Aguilar
2019-04-25 9:54 ` [PATCH v4 5/6] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-25 9:54 ` [PATCH v4 6/6] difftool: fallback on merge.guitool Denton Liu
2019-04-29 6:20 ` [PATCH v5 0/7] difftool and mergetool improvements Denton Liu
2019-04-29 6:21 ` [PATCH v5 1/7] t7610: unsuppress output Denton Liu
2019-04-29 6:21 ` [PATCH v5 2/7] t7610: add mergetool --gui tests Denton Liu
2019-04-29 6:21 ` [PATCH v5 3/7] mergetool: use get_merge_tool function Denton Liu
2019-04-29 6:21 ` [PATCH v5 4/7] mergetool--lib: create gui_mode function Denton Liu
2019-04-29 6:21 ` [PATCH v5 5/7] mergetool: fallback to tool when guitool unavailable Denton Liu
2019-04-29 6:21 ` [PATCH v5 6/7] difftool: make --gui, --tool and --extcmd mutually exclusive Denton Liu
2019-04-29 6:21 ` [PATCH v5 7/7] difftool: fallback on merge.guitool Denton Liu
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq36m6zsn5.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=liu.denton@gmail.com \
--cc=sunshine@sunshineco.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).