Merge branch 'gf/maint-sh-setup-nongit-ok'

diff --git a/builtin-diff-tree.c b/builtin-diff-tree.c
index 79cedb72c44dca3edf400d86e401a93531b54407..2380c21951fb5fb8050ab1acf0e7f01f36ea5520 100644 (file)
--- a/builtin-diff-tree.c
+++ b/builtin-diff-tree.c
@@ -104,6 +104,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
        git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
        opt->abbrev = 0;
        opt->diff = 1;
+       opt->disable_stdin = 1;
        argc = setup_revisions(argc, argv, opt, NULL);
 
        while (--argc > 0) {