зеркало из https://github.com/microsoft/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>
This commit is contained in:
Родитель
07cf0f2407
Коммит
76ea93ccb5
|
@ -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=")) {
|
||||
|
|
Загрузка…
Ссылка в новой задаче