gitignore(5): Allow "foo/" in ignore list to match directory "foo"

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

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 1967d100f28d70e588fde618aa7ed4a10b76ee1d..c0ea0342b755c6749391803d19f852182c0c512e 100644 (file)
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -13,15 +13,16 @@
 #include "dir.h"
 #include "builtin.h"
 
+#define MAX_TREES 8
 static int nr_trees;
-static struct tree *trees[4];
+static struct tree *trees[MAX_TREES];
 
 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;
@@ -96,7 +97,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
 {
        int i, newfd, stage = 0;
        unsigned char sha1[20];
-       struct tree_desc t[3];
+       struct tree_desc t[MAX_TREES];
        struct unpack_trees_options opts;
 
        memset(&opts, 0, sizeof(opts));
@@ -282,7 +283,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;
 }