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/fsck.c | |
| parent | Merge branch 'fz/po-zh_CN' of github.com:fangyi-zhou/git-po (diff) | |
| parent | Git 2.34-rc1 (diff) | |
| download | tgif-bbf1932c3085706a6a3bc8d7ba79e007ad7bda15.tar.xz | |
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/fsck.c')
| -rw-r--r-- | builtin/fsck.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 30a516da29..d87c28a1cc 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -835,6 +835,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) fsck_enable_object_names(&fsck_walk_options); git_config(git_fsck_config, &fsck_obj_options); + prepare_repo_settings(the_repository); if (connectivity_only) { for_each_loose_object(mark_loose_for_connectivity, NULL, 0); @@ -940,7 +941,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) check_connectivity(); - if (!git_config_get_bool("core.commitgraph", &i) && i) { + if (the_repository->settings.core_commit_graph) { struct child_process commit_graph_verify = CHILD_PROCESS_INIT; const char *verify_argv[] = { "commit-graph", "verify", NULL, NULL, NULL }; @@ -956,7 +957,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } } - if (!git_config_get_bool("core.multipackindex", &i) && i) { + if (the_repository->settings.core_multi_pack_index) { struct child_process midx_verify = CHILD_PROCESS_INIT; const char *midx_argv[] = { "multi-pack-index", "verify", NULL, NULL, NULL }; |