compat: Add simplified merge sort implementation from glibc

diff --git a/builtin-write-tree.c b/builtin-write-tree.c
index 88f34ba7d6e2426fae5169eb28b12e93e72082eb..d16b9ed0098fd5c12fe83638f51cc3f10fd87ed7 100644 (file)
--- a/builtin-write-tree.c
+++ b/builtin-write-tree.c
@@ -35,11 +35,9 @@ 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)
-                                       && !close(newfd)) {
-                               commit_lock_file(lock_file);
+                       if (!write_cache(newfd, active_cache, active_nr) &&
+                           !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
@@ -60,8 +58,7 @@ int write_tree(unsigned char *sha1, int missing_ok, const char *prefix)
                hashcpy(sha1, active_cache_tree->sha1);
 
        if (0 <= newfd)
-               close(newfd);
-       rollback_lock_file(lock_file);
+               rollback_lock_file(lock_file);
 
        return 0;
 }
@@ -72,6 +69,7 @@ int cmd_write_tree(int argc, const char **argv, const char *unused_prefix)
        const char *prefix = NULL;
        unsigned char sha1[20];
 
+       git_config(git_default_config);
        while (1 < argc) {
                const char *arg = argv[1];
                if (!strcmp(arg, "--missing-ok"))