Re: [PATCH] fast-import: Stream very large blobs directly to pack
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:48:10
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] fast-import: Stream very large blobs directly to pack · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] fast-import: Stream very large blobs directly to pack · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH] fast-import: Stream very large blobs directly to pack · Shawn O. Pearce <hidden>
- 2016-06-15 · Re: [PATCH] fast-import: Stream very large blobs directly to pack · Shawn O. Pearce <hidden>
- 2016-06-15 · Re: [PATCH] fast-import: Stream very large blobs directly to pack · Shawn O. Pearce <hidden>
Junio C Hamano [off-list ref] wrote:
quoted hunk ↗ jump to hunk
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);
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.
--
Shawn.