string-list: rename the include guard to STRING_LIST_H

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