git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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: [PATCH] fast-import: Document the core.bigFileThreshold configuration setting
Date: Mon, 1 Feb 2010 07:41:33 -0800	[thread overview]
Message-ID: <20100201154133.GF8916@spearce.org> (raw)
In-Reply-To: <7v3a1oyrkp.fsf@alter.siamese.dyndns.org>

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 Junio C Hamano <gitster@pobox.com> wrote:
 > 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.

 Doc patch.  :-)

 Feel free to squash, or to apply as its own change, I don't care
 either way.

 Documentation/config.txt |   14 ++++++++++++++
 fast-import.c            |    2 +-
 2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/Documentation/config.txt b/Documentation/config.txt
index f7728ec..b16a20b 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -409,6 +409,20 @@ You probably do not need to adjust this value.
 +
 Common unit suffixes of 'k', 'm', or 'g' are supported.
 
+core.bigFileThreshold::
+	Files larger than this size are stored deflated, without
+	attempting delta compression.  Storing large files without
+	delta compression avoids excessive memory usage, at the
+	slight expense of increased disk usage.
++
+Default is 512 MiB on all platforms.  This should be reasonable
+for most projects as source code and other text files can still
+be delta compressed, but larger binary media files won't be.
++
+Common unit suffixes of 'k', 'm', or 'g' are supported.
++
+Currently only linkgit:git-fast-import[1] honors this setting.
+
 core.excludesfile::
 	In addition to '.gitignore' (per-directory) and
 	'.git/info/exclude', git looks into this file for patterns
diff --git a/fast-import.c b/fast-import.c
index 8055f73..1bcf3bb 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -2613,7 +2613,7 @@ static int git_pack_config(const char *k, const char *v, void *cb)
 }
 
 static const char fast_import_usage[] =
-"git fast-import [--date-format=f] [--max-pack-size=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
+"git fast-import [--date-format=f] [--max-pack-size=n] [--big-file-threshold=n] [--depth=n] [--active-branches=n] [--export-marks=marks.file]";
 
 int main(int argc, const char **argv)
 {
-- 
1.7.0.rc0.170.g7207c

-- 
Shawn.

  parent reply	other threads:[~2010-02-01 15:41 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
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           ` Shawn O. Pearce [this message]
2010-02-01 15:23         ` 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=20100201154133.GF8916@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).