From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 4 Feb 2010 02:27:08 +0000 (-0800)
Subject: fast-import.c: Fix big-file-threshold parsing bug
X-Git-Tag: v1.7.0-rc2~15
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=76ea93ccb5df138eb57b2e8f2aee61dd1ca666ea;p=git.git

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 <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/fast-import.c b/fast-import.c
index ca210822d..a6730d0ba 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=")) {