From 76ea93ccb5df138eb57b2e8f2aee61dd1ca666ea Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 3 Feb 2010 18:27:08 -0800 Subject: [PATCH] fast-import.c: Fix big-file-threshold parsing bug Manual merge made at 844ad3d (Merge branch 'sp/maint-fast-import-large-blob' into sp/fast-import-large-blob, 2010-02-01) did not correctly reflect the change of unit in which this variable's value is counted from its previous version. Now it counts in bytes, not in megabytes. Signed-off-by: Junio C Hamano Acked-by: Shawn O. Pearce --- fast-import.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fast-import.c b/fast-import.c index ca210822db..a6730d0bac 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=")) { -- 2.11.4.GIT