diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-04-29 02:03:03 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-04-29 02:03:03 +0300 |
| commit | fc23c397c7088a397a693bc5cb483a5894f59f53 (patch) | |
| tree | 69d916089913084988fe52b5b87908d8cec7a95b /repo-settings.c | |
| parent | f85cd430b12b0d3e4f1a30ef3239a1b73d5f6331 (diff) | |
| parent | 029a632c35861b3395c71e767d80bbf463dc1ae1 (diff) | |
Merge branch 'tb/enable-cruft-packs-by-default'
When "gc" needs to retain unreachable objects, packing them into
cruft packs (instead of exploding them into loose object files) has
been offered as a more efficient option for some time. Now the use
of cruft packs has been made the default and no longer considered
an experimental feature.
* tb/enable-cruft-packs-by-default:
repository.h: drop unused `gc_cruft_packs`
builtin/gc.c: make `gc.cruftPacks` enabled by default
t/t9300-fast-import.sh: prepare for `gc --cruft` by default
t/t6500-gc.sh: add additional test cases
t/t6500-gc.sh: refactor cruft pack tests
t/t6501-freshen-objects.sh: prepare for `gc --cruft` by default
t/t5304-prune.sh: prepare for `gc --cruft` by default
builtin/gc.c: ignore cruft packs with `--keep-largest-pack`
builtin/repack.c: fix incorrect reference to '-C'
pack-write.c: plug a leak in stage_tmp_packfiles()
Diffstat (limited to 'repo-settings.c')
| -rw-r--r-- | repo-settings.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/repo-settings.c b/repo-settings.c index bdd7640ab0..d220c5dd9f 100644 --- a/repo-settings.c +++ b/repo-settings.c @@ -41,10 +41,8 @@ void prepare_repo_settings(struct repository *r) repo_cfg_bool(r, "feature.experimental", &experimental, 0); /* Defaults modified by feature.* */ - if (experimental) { + if (experimental) r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_SKIPPING; - r->settings.gc_cruft_packs = 1; - } if (manyfiles) { r->settings.index_version = 4; r->settings.index_skip_hash = 1; |