diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
| commit | f4f8dfe127918241c1e3448436d32a89f13fa5a8 (patch) | |
| tree | 7da8889b7333a7744024f53192f397f68b5b9761 /builtin/pack-objects.c | |
| parent | 4a12f89865236789b5723277bb6809e92ce68f54 (diff) | |
| parent | aaf633c2ad10b47af7623c130ddfe7231658c7e4 (diff) | |
| download | git-f4f8dfe127918241c1e3448436d32a89f13fa5a8.tar.gz | |
Merge branch 'ds/feature-macros'
A mechanism to affect the default setting for a (related) group of
configuration variables is introduced.
* ds/feature-macros:
repo-settings: create feature.experimental setting
repo-settings: create feature.manyFiles setting
repo-settings: parse core.untrackedCache
commit-graph: turn on commit-graph by default
t6501: use 'git gc' in quiet mode
repo-settings: consolidate some config settings
Diffstat (limited to 'builtin/pack-objects.c')
| -rw-r--r-- | builtin/pack-objects.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 76ce906946..b410801edb 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -2715,10 +2715,6 @@ static int git_pack_config(const char *k, const char *v, void *cb) use_bitmap_index_default = git_config_bool(k, v); return 0; } - if (!strcmp(k, "pack.usesparse")) { - sparse = git_config_bool(k, v); - return 0; - } if (!strcmp(k, "pack.threads")) { delta_search_threads = git_config_int(k, v); if (delta_search_threads < 0) @@ -3343,6 +3339,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix) read_replace_refs = 0; sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0); + prepare_repo_settings(the_repository); + if (!sparse && the_repository->settings.pack_use_sparse != -1) + sparse = the_repository->settings.pack_use_sparse; + reset_pack_idx_option(&pack_idx_opts); git_config(git_pack_config, NULL); |