On Wed, 3 Feb 2010, Junio C Hamano wrote: > "Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: > > > 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. Yes, definitely. I'm about to post a patch moving --max-pack-size in that direction too. I just had to fix a couple other unsuspected issues to get there though. Patches will follow shortly. Nicolas -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html