From: Junio C Hamano Date: Thu, 04 Feb 2010 02:27:08 GMT Subject: Re: [PATCH] fast-import: Stream very large blobs directly to pack Message-ID: <7vk4utybur.fsf@alter.siamese.dyndns.org> In-Reply-To: <7vock5yby2.fsf@alter.siamese.dyndns.org> Junio C Hamano writes: > "Shawn O. Pearce" writes: > >> In my v3 patch I thought I replaced this code with: >> >> + else if (!prefixcmp(a, "--big-file-threshold=")) { >> + unsigned long v; >> + if (!git_parse_ulong(a + 21, &v)) >> + usage(fast_import_usage); >> + big_file_threshold = v; >> >> So we relied on git_parse_ulong to handle unit suffixes as well. > > Yeah, you did; but it didn't carried through the merge process across the > code restructure to add "option_blah" stuff. Sorry about that. And this is a fix-up for the mismerge. I didn't touch max-pack-size stuff. fast-import.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/fast-import.c b/fast-import.c index ca21082..a6730d0 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2800,7 +2800,10 @@ static int parse_one_option(const char *option) if (!prefixcmp(option, "max-pack-size=")) { option_max_pack_size(option + 14); } else if (!prefixcmp(option, "big-file-threshold=")) { - big_file_threshold = strtoumax(option + 19, NULL, 0) * 1024 * 1024; + unsigned long v; + if (!git_parse_ulong(option + 19, &v)) + return 0; + big_file_threshold = v; } else if (!prefixcmp(option, "depth=")) { option_depth(option + 6); } else if (!prefixcmp(option, "active-branches=")) {