Changed an internal variable of mergetool to support custom commands

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 9ab90cb4c535a1328806c05515ba089e1d7147dc..832797ff3bb45751758f0d629abb2cf8fa4507ad 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -68,7 +68,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
        int read_stdin = 0;
 
        init_revisions(opt, prefix);
-       git_config(git_default_config); /* no "diff" UI options */
+       git_config(git_diff_basic_config); /* no "diff" UI options */
        nr_sha1 = 0;
        opt->abbrev = 0;
        opt->diff = 1;
@@ -132,8 +132,6 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
                                diff_tree_stdin(line);
                }
        }
-       if (opt->diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
-               return DIFF_OPT_TST(&opt->diffopt, CHECK_FAILED) != 0;
-       return DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS)
-               && DIFF_OPT_TST(&opt->diffopt, HAS_CHANGES);
+
+       return diff_result_code(&opt->diffopt, 0);
 }