summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-08-17 02:24:08 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-08-17 04:19:06 (GMT)
commita9ab2009dbbf769aadd52957950c1bad60a0c8fd (patch)
treeecd30e7b8c3e398695038858aff9db78433d4532
parentd1d028ea16af27158f5d77154cfa60dbd9143314 (diff)
downloadgit-a9ab2009dbbf769aadd52957950c1bad60a0c8fd.zip
git-a9ab2009dbbf769aadd52957950c1bad60a0c8fd.tar.gz
git-a9ab2009dbbf769aadd52957950c1bad60a0c8fd.tar.bz2
Clean-up read-tree error condition.
This is a follow-up to f34f2b0b; list_tree() function is where it first notices that the command line fed too many trees for us to handle, so move the error exit message to there, and raise the MAX_TREES to 8 (not that it matters very much in practice). Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin-read-tree.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index f6764b9..43cd56a 100644
--- 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;
@@ -264,9 +264,6 @@ 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);