gitweb: Make git_get_hash_by_path check type if provided

diff --git a/merge-tree.c b/merge-tree.c
index 60df758c41174bb8a9cc526660752c80b1988bbf..692ede0e3db7df66b2e5943dc58224f34c59fd8c 100644 (file)
--- a/merge-tree.c
+++ b/merge-tree.c
@@ -337,9 +337,11 @@ int main(int argc, char **argv)
        struct tree_desc t[3];
        void *buf1, *buf2, *buf3;
 
-       if (argc < 4)
+       if (argc != 4)
                usage(merge_tree_usage);
 
+       setup_git_directory();
+
        buf1 = get_tree_descriptor(t+0, argv[1]);
        buf2 = get_tree_descriptor(t+1, argv[2]);
        buf3 = get_tree_descriptor(t+2, argv[3]);