summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-04 14:57:38 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-04 14:57:38 -0700
commitf28d2e33c64819d0425c426cd2c4511634096a40 (patch)
tree13d36e58177d1723b4759db99992b4ee03473216 /fast-import.c
parentf6bfe767149c15b359106cb9f138853be3c14667 (diff)
parent15366280c27e922ace0ba7d33cb3504dc59d742e (diff)
downloadgit-f28d2e33c64819d0425c426cd2c4511634096a40.tar.gz
Merge branch 'jc/pack-objects-bigfile' into maint
* jc/pack-objects-bigfile: Teach core.bigfilethreashold to pack-objects
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/fast-import.c b/fast-import.c
index 65d65bf8f9..3e4e655bb9 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -274,7 +274,6 @@ struct recent_command {
/* Configured limits on output */
static unsigned long max_depth = 10;
static off_t max_packsize;
-static uintmax_t big_file_threshold = 512 * 1024 * 1024;
static int force_update;
static int pack_compression_level = Z_DEFAULT_COMPRESSION;
static int pack_compression_seen;
@@ -3206,10 +3205,6 @@ static int git_pack_config(const char *k, const char *v, void *cb)
max_packsize = git_config_ulong(k, v);
return 0;
}
- if (!strcmp(k, "core.bigfilethreshold")) {
- long n = git_config_int(k, v);
- big_file_threshold = 0 < n ? n : 0;
- }
return git_default_config(k, v, cb);
}