undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean-up read-tree error condition.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2007-08-16 19:24:08 -07:00
parent d1d028ea16
commit a9ab2009db
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
builtin-read-tree.c
View File

@ -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);