git-merge: Exit with code 2 if no strategy was able to handle the merge.

[git.git] / write-tree.c

diff --git a/write-tree.c b/write-tree.c
index 561a101..0aac32f 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -86,17 +86,20 @@ static int write_tree(struct cache_entry **cachep, int maxentries, const char *b
 int main(int argc, char **argv)
 {
        int i, funny;
-       int entries = read_cache();
+       int entries;
        unsigned char sha1[20];
        
-       if (argc==2) {
+       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]);
        }
        
-       if (argc>2)
+       if (argc > 2)
                die("too many options");
 
        if (entries < 0)