summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-16 22:33:40 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-16 22:33:40 -0800
commit48b303675aa238c209e527feadcbb7ba1c025c97 (patch)
tree6a48f4388867f836db0e4c015098348079a9185d /environment.c
parente45c9b03c32620c444f464403c23534160998624 (diff)
parent568508e76570e9ea36aad6446959424cebcf0535 (diff)
downloadgit-48b303675aa238c209e527feadcbb7ba1c025c97.tar.gz
Merge branch 'jc/stream-to-pack'
* jc/stream-to-pack: bulk-checkin: replace fast-import based implementation csum-file: introduce sha1file_checkpoint finish_tmp_packfile(): a helper function create_tmp_packfile(): a helper function write_pack_header(): a helper function Conflicts: pack.h
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 2c41d7d6cb..c93b8f44df 100644
--- a/environment.c
+++ b/environment.c
@@ -62,6 +62,7 @@ int grafts_replace_parents = 1;
int core_apply_sparse_checkout;
int merge_log_config = -1;
struct startup_info *startup_info;
+unsigned long pack_size_limit_cfg;
/* Parallel index stat data preload? */
int core_preload_index = 0;