Don't try to delta if target is much smaller than source
[gitweb.git] / builtin-write-tree.c
index 50670dc7bf46c74e95b2e204d05afc077350a19f..391de53972ebf77d2e08f1b405969e065bd8b371 100644 (file)
@@ -18,7 +18,7 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
        /* We can't free this memory, it becomes part of a linked list parsed atexit() */
        struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
 
-       newfd = hold_lock_file_for_update(lock_file, get_index_file(), 0);
+       newfd = hold_locked_index(lock_file, 1);
 
        entries = read_cache();
        if (entries < 0)
@@ -36,8 +36,10 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
                        die("git-write-tree: error building trees");
                if (0 <= newfd) {
                        if (!write_cache(newfd, active_cache, active_nr)
-                                       && !close(newfd))
+                                       && !close(newfd)) {
                                commit_lock_file(lock_file);
+                               newfd = -1;
+                       }
                }
                /* Not being able to write is fine -- we are only interested
                 * in updating the cache-tree part, and if the next caller
@@ -55,6 +57,8 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
        else
                hashcpy(sha1, active_cache_tree->sha1);
 
+       if (0 <= newfd)
+               close(newfd);
        rollback_lock_file(lock_file);
 
        return 0;
@@ -70,7 +74,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
                const char *arg = argv[1];
                if (!strcmp(arg, "--missing-ok"))
                        missing_ok = 1;
-               else if (!strncmp(arg, "--prefix=", 9))
+               else if (!prefixcmp(arg, "--prefix="))
                        prefix = arg + 9;
                else
                        usage(write_tree_usage);