diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-10-10 03:37:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-10-10 03:37:16 (GMT) |
| commit | 468b322137900dfd508adc69692e484d6dafe991 (patch) | |
| tree | be8a46a9676b4b95ec66df1ab852f03d79f0ca6c /builtin | |
| parent | d555663f16fb1bc28ebc44a4e78ff4e277c3b69e (diff) | |
| parent | 66ec0390e75406aa9f9295577052b9ec06d3a169 (diff) | |
| download | git-468b322137900dfd508adc69692e484d6dafe991.zip git-468b322137900dfd508adc69692e484d6dafe991.tar.gz git-468b322137900dfd508adc69692e484d6dafe991.tar.bz2 | |
Merge branch 'ds/multi-pack-verify'
"git multi-pack-index" learned to detect corruption in the .midx
file it uses, and this feature has been integrated into "git fsck".
* ds/multi-pack-verify:
fsck: verify multi-pack-index
multi-pack-index: report progress during 'verify'
multi-pack-index: verify object offsets
multi-pack-index: fix 32-bit vs 64-bit size check
multi-pack-index: verify oid lookup order
multi-pack-index: verify oid fanout order
multi-pack-index: verify missing pack
multi-pack-index: verify packname order
multi-pack-index: verify corrupt chunk lookup table
multi-pack-index: verify bad header
multi-pack-index: add 'verify' verb
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fsck.c | 18 | ||||
| -rw-r--r-- | builtin/multi-pack-index.c | 4 |
2 files changed, 21 insertions, 1 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 63c8578..06eb421 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -848,5 +848,23 @@ int cmd_fsck(int argc, const char **argv, const char *prefix) } } + if (!git_config_get_bool("core.multipackindex", &i) && i) { + struct child_process midx_verify = CHILD_PROCESS_INIT; + const char *midx_argv[] = { "multi-pack-index", "verify", NULL, NULL, NULL }; + + midx_verify.argv = midx_argv; + midx_verify.git_cmd = 1; + if (run_command(&midx_verify)) + errors_found |= ERROR_COMMIT_GRAPH; + + prepare_alt_odb(the_repository); + for (alt = the_repository->objects->alt_odb_list; alt; alt = alt->next) { + midx_argv[2] = "--object-dir"; + midx_argv[3] = alt->path; + if (run_command(&midx_verify)) + errors_found |= ERROR_COMMIT_GRAPH; + } + } + return errors_found; } diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c index 2633efd..fca70f8 100644 --- a/builtin/multi-pack-index.c +++ b/builtin/multi-pack-index.c @@ -5,7 +5,7 @@ #include "midx.h" static char const * const builtin_multi_pack_index_usage[] = { - N_("git multi-pack-index [--object-dir=<dir>] write"), + N_("git multi-pack-index [--object-dir=<dir>] (write|verify)"), NULL }; @@ -42,6 +42,8 @@ int cmd_multi_pack_index(int argc, const char **argv, if (!strcmp(argv[0], "write")) return write_midx_file(opts.object_dir); + if (!strcmp(argv[0], "verify")) + return verify_midx_file(opts.object_dir); die(_("unrecognized verb: %s"), argv[0]); } |