combine-diff: extend --cc logic to Octopus.

diff --git a/write-tree.c b/write-tree.c
index 561a101fa97c4fbf044093bdfe2cae56b94ce8bf..f866059f24bacd314fa4a979334a9893dbfc19ba 100644 (file)
--- a/write-tree.c
+++ b/write-tree.c
@@ -83,20 +83,25 @@ 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];
        
-       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]);
+                       die(write_tree_usage);
        }
        
-       if (argc>2)
+       if (argc > 2)
                die("too many options");
 
        if (entries < 0)