Merge branch 'lt/merge-tree'

diff --git a/write-tree.c b/write-tree.c
index 2b2c6b77afd53870423d4bad9191ed669bc55660..f866059f24bacd314fa4a979334a9893dbfc19ba 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -83,17 +83,22 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
        return nr;
 }
 
+static const char write_tree_usage[] = "git-write-tree [--missing-ok]";
+
 int main(int argc, char **argv)
 {
        int i, funny;
-       int entries = read_cache();
+       int entries;
        unsigned char sha1[20];
        
+       setup_git_directory();
+
+       entries = read_cache();
        if (argc == 2) {
                if (!strcmp(argv[1], "--missing-ok"))
                        missing_ok = 1;
                else
-                       die("unknown option %s", argv[1]);
+                       die(write_tree_usage);
        }
        
        if (argc > 2)