From: Junio C Hamano <gitster@pobox.com>
To: Perrin Meyer <perrinmeyer@yahoo.com>
Cc: git@vger.kernel.org
Subject: Re: 1.5.3-rc5 regression on OS X?
Date: Wed, 15 Aug 2007 15:42:49 -0700 [thread overview]
Message-ID: <7vfy2ko1w6.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <600399.61066.qm@web52807.mail.re2.yahoo.com> (Perrin Meyer's message of "Wed, 15 Aug 2007 14:19:47 -0700 (PDT)")
Does this help?
---
builtin-read-tree.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 1967d10..5b07e9a 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -96,7 +96,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[20];
struct unpack_trees_options opts;
memset(&opts, 0, sizeof(opts));
@@ -263,6 +263,9 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
opts.head_idx = 1;
}
+ if (ARRAY_SIZE(t) < nr_trees)
+ die("I cannot read more than %d trees", ARRAY_SIZE(t));
+
for (i = 0; i < nr_trees; i++) {
struct tree *tree = trees[i];
parse_tree(tree);
next prev parent reply other threads:[~2007-08-15 22:43 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-15 21:19 1.5.3-rc5 regression on OS X? Perrin Meyer
2007-08-15 21:33 ` Junio C Hamano
2007-08-15 21:43 ` Brian Gernhardt
2007-08-15 22:14 ` Randal L. Schwartz
2007-08-15 22:42 ` Junio C Hamano [this message]
2007-08-15 22:46 ` [PATCH] Fix read-tree merging more than 3 trees using 3-way merge Junio C Hamano
2007-08-17 0:59 ` Linus Torvalds
2007-08-17 2:14 ` Junio C Hamano
2007-08-17 2:32 ` Linus Torvalds
2007-08-17 3:38 ` Junio C Hamano
2007-08-17 3:44 ` Linus Torvalds
-- strict thread matches above, loose matches on Subject: below --
2007-08-15 22:01 1.5.3-rc5 regression on OS X? Perrin Meyer
2007-08-15 22:05 ` Junio C Hamano
2007-08-15 22:52 Perrin Meyer
2007-08-15 22:59 ` Junio C Hamano
2007-08-15 23:35 Perrin Meyer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vfy2ko1w6.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=perrinmeyer@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).