Skip to content

Commit

Permalink
Clean-up read-tree error condition.
Browse files Browse the repository at this point in the history
This is a follow-up to f34f2b0; 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>
  • Loading branch information
Junio C Hamano committed Aug 17, 2007
1 parent d1d028e commit a9ab200
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions builtin-read-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
#include "dir.h"
#include "builtin.h"

#define MAX_TREES 4
#define MAX_TREES 8
static int nr_trees;
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;
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit a9ab200

Please sign in to comment.