From: "Shawn O. Pearce" <spearce@spearce.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Sverre Rabbelier <srabbelier@gmail.com>,
git <git@vger.kernel.org>, Nicolas Pitre <nico@fluxnic.net>
Subject: Re: [PATCH] fast-import: Stream very large blobs directly to pack
Date: Mon, 1 Feb 2010 07:28:26 -0800 [thread overview]
Message-ID: <20100201152826.GE8916@spearce.org> (raw)
In-Reply-To: <7v3a1oyrkp.fsf@alter.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> wrote:
> I'll queued this with a result of my conflict resolution to 'pu' for now
> but please double check after I push it out.
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.
--
Shawn.
next prev parent reply other threads:[~2010-02-01 15:28 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-29 1:23 [PATCH] fast-import: Stream very large blobs directly to pack Shawn O. Pearce
2010-01-29 2:33 ` Nicolas Pitre
2010-01-29 2:37 ` Shawn O. Pearce
2010-01-29 5:29 ` Junio C Hamano
2010-01-29 15:22 ` Shawn O. Pearce
2010-01-29 16:38 ` [PATCH v2] " Shawn O. Pearce
2010-01-29 18:29 ` Jakub Narebski
2010-01-29 18:30 ` Shawn O. Pearce
2010-01-29 23:02 ` A Large Angry SCM
2010-01-30 7:17 ` Junio C Hamano
2010-01-29 18:35 ` [PATCH] " Sverre Rabbelier
2010-01-29 18:37 ` Shawn O. Pearce
2010-01-29 18:41 ` Sverre Rabbelier
2010-01-29 18:44 ` Shawn O. Pearce
2010-01-30 3:41 ` Junio C Hamano
2010-01-30 6:19 ` Junio C Hamano
2010-01-30 7:33 ` Junio C Hamano
2010-02-01 15:28 ` Shawn O. Pearce [this message]
2010-02-01 20:14 ` Junio C Hamano
2010-02-04 2:01 ` Junio C Hamano
2010-02-04 2:07 ` Shawn O. Pearce
2010-02-04 2:25 ` Junio C Hamano
2010-02-04 2:27 ` Junio C Hamano
2010-02-04 2:30 ` Shawn O. Pearce
2010-02-04 2:28 ` Nicolas Pitre
2010-02-01 15:41 ` [PATCH] fast-import: Document the core.bigFileThreshold configuration setting Shawn O. Pearce
2010-02-01 15:23 ` [PATCH] fast-import: Stream very large blobs directly to pack Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100201152826.GE8916@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nico@fluxnic.net \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).