diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2021-11-04 08:34:15 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2021-11-04 08:34:15 +0800 |
| commit | bbf1932c3085706a6a3bc8d7ba79e007ad7bda15 (patch) | |
| tree | 4e14e8282070a6ee6d274343a44b78f8f7c112c8 /builtin/gc.c | |
| parent | 66e6babac6c3698cdcb8944307a0d5ac21562ab0 (diff) | |
| parent | 876b1423317071f43c99666f3fc3db3642dfbe14 (diff) | |
| download | git-bbf1932c3085706a6a3bc8d7ba79e007ad7bda15.tar.gz | |
Merge branch 'master' of github.com:git/git
* 'master' of github.com:git/git:
Git 2.34-rc1
rebase -i: fix rewording with --committer-date-is-author-date
dir: fix directory-matching bug
gpg-interface: avoid buffer overrun in parse_ssh_output()
gpg-interface: handle missing " with " gracefully in parse_ssh_output()
A few more topics before -rc1
i18n: fix typos found during l10n for git 2.34.0
t5310: drop lib-bundle.sh include
format-patch (doc): clarify --base=auto
gc: perform incremental repack when implictly enabled
fsck: verify multi-pack-index when implictly enabled
fsck: verify commit graph when implicitly enabled
grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data
commit-graph: don't consider "replace" objects with "verify"
commit-graph tests: fix another graph_git_two_modes() helper
commit-graph tests: fix error-hiding graph_git_two_modes() helper
pretty: colorize pattern matches in commit messages
grep: refactor next_match() and match_one_pattern() for external use
Diffstat (limited to 'builtin/gc.c')
| -rw-r--r-- | builtin/gc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/builtin/gc.c b/builtin/gc.c index 6b3de3dd51..2670931160 100644 --- a/builtin/gc.c +++ b/builtin/gc.c @@ -1049,12 +1049,11 @@ static int maintenance_task_loose_objects(struct maintenance_run_opts *opts) static int incremental_repack_auto_condition(void) { struct packed_git *p; - int enabled; int incremental_repack_auto_limit = 10; int count = 0; - if (git_config_get_bool("core.multiPackIndex", &enabled) || - !enabled) + prepare_repo_settings(the_repository); + if (!the_repository->settings.core_multi_pack_index) return 0; git_config_get_int("maintenance.incremental-repack.auto", |