Fix linking for not-so-clever linkers.

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 3409a39a9f73f9ed67547f5cc79619c1e402f47b..b6106685942e3cb3a5db2b3a67123b5bd554d856 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -67,7 +67,7 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
        static struct rev_info *opt = &log_tree_opt;
        int read_stdin = 0;
 
-       git_config(git_diff_config);
+       git_config(git_default_config); /* no "diff" UI options */
        nr_sha1 = 0;
        init_revisions(opt);
        opt->abbrev = 0;
@@ -84,6 +84,9 @@ int cmd_diff_tree(int argc, const char **argv, char **envp)
                usage(diff_tree_usage);
        }
 
+       if (!opt->diffopt.output_format)
+               opt->diffopt.output_format = DIFF_FORMAT_RAW;
+
        /*
         * NOTE! We expect "a ^b" to be equal to "a..b", so we
         * reverse the order of the objects if the second one