mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

difftool: fallback on merge.guitool

Browse Source 
In git-difftool.txt, it says

	'git difftool' falls back to 'git mergetool' config variables when the
	difftool equivalents have not been defined.

However, when `diff.guitool` is missing, it doesn't fallback to
anything. Make git-difftool fallback to `merge.guitool` when `diff.guitool` is
missing.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Denton Liu
2019-04-29 02:21:20 -04:00
committed by Junio C Hamano
parent 7f978d7d10
commit 6c22d715e7
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/git-difftool.txt
View File

@ -90,7 +90,9 @@ instead. `--no-symlinks` is the default on Windows.
When 'git-difftool' is invoked with the `-g` or `--gui` option When 'git-difftool' is invoked with the `-g` or `--gui` option
the default diff tool will be read from the configured the default diff tool will be read from the configured
`diff.guitool` variable instead of `diff.tool`. The `--no-gui` `diff.guitool` variable instead of `diff.tool`. The `--no-gui`
option can be used to override this setting. option can be used to override this setting. If `diff.guitool`
is not set, we will fallback in the order of `merge.guitool`,
`diff.tool`, `merge.tool` until a tool is found.
--[no-]trust-exit-code:: --[no-]trust-exit-code::
'git-difftool' invokes a diff tool individually on each file. 'git-difftool' invokes a diff tool individually on each file.

10
builtin/difftool.c
View File

@ -23,7 +23,6 @@
#include "object-store.h" #include "object-store.h"
#include "dir.h" #include "dir.h"
static char *diff_gui_tool;
static int trust_exit_code; static int trust_exit_code;
static const char *const builtin_difftool_usage[] = { static const char *const builtin_difftool_usage[] = {
@ -33,11 +32,6 @@ static const char *const builtin_difftool_usage[] = {
static int difftool_config(const char *var, const char *value, void *cb) static int difftool_config(const char *var, const char *value, void *cb)
{ {
if (!strcmp(var, "diff.guitool")) {
diff_gui_tool = xstrdup(value);
return 0;
}
if (!strcmp(var, "difftool.trustexitcode")) { if (!strcmp(var, "difftool.trustexitcode")) {
trust_exit_code = git_config_bool(var, value); trust_exit_code = git_config_bool(var, value);
return 0; return 0;
@ -733,8 +727,8 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
if (use_gui_tool + !!difftool_cmd + !!extcmd > 1) if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
die(_("--gui, --tool and --extcmd are mutually exclusive")); die(_("--gui, --tool and --extcmd are mutually exclusive"));
if (use_gui_tool && diff_gui_tool && *diff_gui_tool) if (use_gui_tool)
setenv("GIT_DIFF_TOOL", diff_gui_tool, 1); setenv("GIT_MERGETOOL_GUI", "true", 1);
else if (difftool_cmd) { else if (difftool_cmd) {
if (*difftool_cmd) if (*difftool_cmd)
setenv("GIT_DIFF_TOOL", difftool_cmd, 1); setenv("GIT_DIFF_TOOL", difftool_cmd, 1);

16
t/t7800-difftool.sh
View File

@ -279,11 +279,27 @@ test_expect_success 'difftool + mergetool config variables' '
echo branch >expect && echo branch >expect &&
git difftool --no-prompt branch >actual && git difftool --no-prompt branch >actual &&
test_cmp expect 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 # set merge.tool to something bogus, diff.tool to test-tool
test_config merge.tool bogus-tool && test_config merge.tool bogus-tool &&
test_config diff.tool test-tool && test_config diff.tool test-tool &&
git difftool --no-prompt branch >actual && 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 test_cmp expect actual
' '