зеркало из https://github.com/microsoft/git.git
fsck: check loose objects from alternate object stores by default
"git fsck" used to validate only loose objects that are local and nothing else by default. This is not just too little when a repository is borrowing objects from other object stores, but also caused the connectivity check to mistakenly declare loose objects borrowed from them to be missing. The rationale behind the default mode that validates only loose objects is because these objects are still young and more unlikely to have been pushed to other repositories yet. That holds for loose objects borrowed from alternate object stores as well. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
469e2ebf63
Коммит
e15ef66943
|
@ -586,6 +586,7 @@ static struct option fsck_opts[] = {
|
|||
int cmd_fsck(int argc, const char **argv, const char *prefix)
|
||||
{
|
||||
int i, heads;
|
||||
struct alternate_object_database *alt;
|
||||
|
||||
errors_found = 0;
|
||||
|
||||
|
@ -597,9 +598,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
|||
|
||||
fsck_head_link();
|
||||
fsck_object_dir(get_object_directory());
|
||||
if (check_full) {
|
||||
struct alternate_object_database *alt;
|
||||
struct packed_git *p;
|
||||
|
||||
prepare_alt_odb();
|
||||
for (alt = alt_odb_list; alt; alt = alt->next) {
|
||||
char namebuf[PATH_MAX];
|
||||
|
@ -608,6 +607,10 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
|
|||
namebuf[namelen - 1] = 0;
|
||||
fsck_object_dir(namebuf);
|
||||
}
|
||||
|
||||
if (check_full) {
|
||||
struct packed_git *p;
|
||||
|
||||
prepare_packed_git();
|
||||
for (p = packed_git; p; p = p->next)
|
||||
/* verify gives error messages itself */
|
||||
|
|
|
@ -16,4 +16,16 @@ test_expect_success 'HEAD is part of refs' '
|
|||
test 0 = $(git fsck | wc -l)
|
||||
'
|
||||
|
||||
test_expect_success 'loose objects borrowed from alternate are not missing' '
|
||||
mkdir another &&
|
||||
(
|
||||
cd another &&
|
||||
git init &&
|
||||
echo ../../../.git/objects >.git/objects/info/alternates &&
|
||||
test_commit C fileC one &&
|
||||
git fsck >out &&
|
||||
! grep "missing blob" out
|
||||
)
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Загрузка…
Ссылка в новой задаче