difftool: fallback on merge.guitool

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>

diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 96c26e6aa82c98da1652023f0d04b4b63c8a4944..484c485fd06c9d52e09b5e7324f5f13fd444e4f9 100644 (file)
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -90,7 +90,9 @@ instead.  `--no-symlinks` is the default on Windows.
        When 'git-difftool' is invoked with the `-g` or `--gui` option
        the default diff tool will be read from the configured
        `diff.guitool` variable instead of `diff.tool`. The `--no-gui`
        When 'git-difftool' is invoked with the `-g` or `--gui` option
        the default diff tool will be read from the configured
        `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::
        'git-difftool' invokes a diff tool individually on each file.
 
 --[no-]trust-exit-code::
        'git-difftool' invokes a diff tool individually on each file.

diff --git a/builtin/difftool.c b/builtin/difftool.c
index 481aa64af51d80af46b01ce1b768d185f0dc3174..2205de1214695f1741dd9a46002183328807de0e 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -23,7 +23,6 @@
 #include "object-store.h"
 #include "dir.h"
 
 #include "object-store.h"
 #include "dir.h"
 

-static char *diff_gui_tool;

 static int trust_exit_code;
 
 static const char *const builtin_difftool_usage[] = {
 static int trust_exit_code;
 
 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")) {
                trust_exit_code = git_config_bool(var, value);
                return 0;
        if (!strcmp(var, "difftool.trustexitcode")) {
                trust_exit_code = git_config_bool(var, value);
                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)
                die(_("--gui, --tool and --extcmd are mutually exclusive"));
 
        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);
        else if (difftool_cmd) {
                if (*difftool_cmd)
                        setenv("GIT_DIFF_TOOL", difftool_cmd, 1);

diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 833e175bf9474a396ed79d4a70cac0d2e015a2f8..48b74c04346eb061ed414dbb254543a11f87886f 100755 (executable)
--- 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 &&
        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 &&
 
        # 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
 '
 
        test_cmp expect actual
 '