Do not merge random set of refs out of wildcarded refs

diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index c3aac36024626b31a60baa52f9e596169024b03a..50670dc7bf46c74e95b2e204d05afc077350a19f 100644 (file)
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -16,9 +16,9 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
        int entries, was_valid, newfd;
 
        /* We can't free this memory, it becomes part of a linked list parsed atexit() */
-       struct lock_file *lock_file = xmalloc(sizeof(struct lock_file));
+       struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
 
-       newfd = hold_lock_file_for_update(lock_file, get_index_file());
+       newfd = hold_lock_file_for_update(lock_file, get_index_file(), 0);
 
        entries = read_cache();
        if (entries < 0)
@@ -35,7 +35,8 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
                                      missing_ok, 0) < 0)
                        die("git-write-tree: error building trees");
                if (0 <= newfd) {
-                       if (!write_cache(newfd, active_cache, active_nr))
+                       if (!write_cache(newfd, active_cache, active_nr)
+                                       && !close(newfd))
                                commit_lock_file(lock_file);
                }
                /* Not being able to write is fine -- we are only interested
@@ -49,24 +50,22 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
        if (prefix) {
                struct cache_tree *subtree =
                        cache_tree_find(active_cache_tree, prefix);
-               memcpy(sha1, subtree->sha1, 20);
+               hashcpy(sha1, subtree->sha1);
        }
        else
-               memcpy(sha1, active_cache_tree->sha1, 20);
+               hashcpy(sha1, active_cache_tree->sha1);
 
        rollback_lock_file(lock_file);
 
        return 0;
 }
 
-int cmd_write_tree(int argc, const char **argv, char **envp)
+int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
 {
        int missing_ok = 0, ret;
        const char *prefix = NULL;
        unsigned char sha1[20];
 
-       setup_git_directory();
-
        while (1 < argc) {
                const char *arg = argv[1];
                if (!strcmp(arg, "--missing-ok"))
@@ -74,7 +73,7 @@ int cmd_write_tree(int argc, const char **argv, char **envp)
                else if (!strncmp(arg, "--prefix=", 9))
                        prefix = arg + 9;
                else
-                       die(write_tree_usage);
+                       usage(write_tree_usage);
                argc--; argv++;
        }