Fix make_absolute_path() for parameters without a slash

[git.git] / builtin-read-tree.c

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index f6764b97392a582f442c356945d71a0bb8887308..0138f5a9172034b2ce34222ff077a975f8998005 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -13,7 +13,7 @@
 #include "dir.h"
 #include "builtin.h"
 
-#define MAX_TREES 4
+#define MAX_TREES 8
 static int nr_trees;
 static struct tree *trees[MAX_TREES];
 
@@ -21,8 +21,8 @@ static int list_tree(unsigned char *sha1)
 {
        struct tree *tree;
 
-       if (nr_trees >= 4)
-               return -1;
+       if (nr_trees >= MAX_TREES)
+               die("I cannot read more than %d trees", MAX_TREES);
        tree = parse_tree_indirect(sha1);
        if (!tree)
                return -1;
@@ -41,12 +41,12 @@ static int read_cache_unmerged(void)
        for (i = 0; i < active_nr; i++) {
                struct cache_entry *ce = active_cache[i];
                if (ce_stage(ce)) {
+                       remove_index_entry(ce);
                        if (last && !strcmp(ce->name, last->name))
                                continue;
                        cache_tree_invalidate_path(active_cache_tree, ce->name);
                        last = ce;
-                       ce->ce_mode = 0;
-                       ce->ce_flags &= ~htons(CE_STAGEMASK);
+                       continue;
                }
                *dst++ = ce;
        }
@@ -264,15 +264,13 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
                        opts.head_idx = 1;
        }
 
-       if (MAX_TREES < nr_trees)
-               die("I cannot read more than %d trees", MAX_TREES);
-
        for (i = 0; i < nr_trees; i++) {
                struct tree *tree = trees[i];
                parse_tree(tree);
                init_tree_desc(t+i, tree->buffer, tree->size);
        }
-       unpack_trees(nr_trees, t, &opts);
+       if (unpack_trees(nr_trees, t, &opts))
+               return 128;
 
        /*
         * When reading only one tree (either the most basic form,
@@ -286,7 +284,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
        }
 
        if (write_cache(newfd, active_cache, active_nr) ||
-           close(newfd) || commit_locked_index(&lock_file))
+           commit_locked_index(&lock_file))
                die("unable to write new index file");
        return 0;
 }