undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsck: don't fsck alternates for connectivity-only check

Browse Source 
Commit 02976bf (fsck: introduce `git fsck --connectivity-only`,
2015-06-22) recently gave fsck an option to perform only a
subset of the checks, by skipping the fsck_object_dir()
call. However, it does so only for the local object
directory, and we still do expensive checks on any alternate
repos. We should skip them in this case, too.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-09-24 17:05:30 -04:00 committed by Junio C Hamano
parent 108332c7a0
commit fbe85e73ce
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
builtin/fsck.c
View File

@ -678,16 +678,17 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
git_config(fsck_config, NULL); git_config(fsck_config, NULL);
fsck_head_link(); fsck_head_link();
if (!connectivity_only) if (!connectivity_only) {
fsck_object_dir(get_object_directory()); fsck_object_dir(get_object_directory());
prepare_alt_odb(); prepare_alt_odb();
for (alt = alt_odb_list; alt; alt = alt->next) { for (alt = alt_odb_list; alt; alt = alt->next) {
char namebuf[PATH_MAX]; char namebuf[PATH_MAX];
int namelen = alt->name - alt->base; int namelen = alt->name - alt->base;
memcpy(namebuf, alt->base, namelen); memcpy(namebuf, alt->base, namelen);
namebuf[namelen - 1] = 0; namebuf[namelen - 1] = 0;
fsck_object_dir(namebuf); fsck_object_dir(namebuf);
}
} }
if (check_full) { if (check_full) {