Re: [PATCH] fast-import: Stream very large blobs directly to pack
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Feb 4, 2010, 02:01 UTC
- Message-ID
- <7v7hqtzrmq.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <20100201152826.GE8916@spearce.org>
"Shawn O. Pearce" <spearce@spearce.org> writes:
Show 22 quoted lines
> The strtoumax call got messed up. Squash this into your merge:
>
> diff --git a/fast-import.c b/fast-import.c
> index e6ebcf6..9c65a24 100644
> --- a/fast-import.c
> +++ b/fast-import.c
> @@ -2800,7 +2800,7 @@ 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 + 21, NULL, 0) * 1024 * 1024;
> + big_file_threshold = strtoumax(option + 19, NULL, 0) * 1024 * 1024;
> } else if (!prefixcmp(option, "depth=")) {
> option_depth(option + 6);
> } else if (!prefixcmp(option, "active-branches=")) {
>
>> You may want to add the new option to the output from "cmd -h" and
>> probably description of the configuration in the doc before any of this
>> gets official.
>
> I'll send an additional patch in a minute with these documentation
> related updates.Well, well, well....
The documentation says this is counted in bytes, but somehow neither of us found the above " * 1024 * 1024" suspicious.
Shouldn't it be at least like this? It would probably be a good idea to use git_parse_ulong() or somesuch while we are at it.
fast-import.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fast-import.c b/fast-import.c index ca21082..ea1ac0f 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2800,7 +2800,7 @@ 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; + big_file_threshold = strtoumax(option + 19, NULL, 0); } else if (!prefixcmp(option, "depth=")) { option_depth(option + 6); } else if (!prefixcmp(option, "active-branches=")) {