mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fsck: factor out index fsck

Browse Source 
The code to fsck an index operates directly on the_index. Let's move it
into its own function in preparation for handling the index files from
other worktrees.

Since we now have only a single reference to the_index, let's drop
our USE_THE_INDEX_VARIABLE definition and just use the_repository.index
directly. That's a minor cleanup, but also ensures that we didn't miss
any references when moving the code into fsck_index().

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2023-02-24 03:07:32 -05:00
committed by Junio C Hamano
parent 768bb238c4
commit 8840069a37
1 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
builtin/fsck.c
View File

@ -1,4 +1,3 @@
#define USE_THE_INDEX_VARIABLE
#include "builtin.h" #include "builtin.h"
#include "cache.h" #include "cache.h"
#include "repository.h" #include "repository.h"
@ -796,6 +795,35 @@ static int fsck_resolve_undo(struct index_state *istate)
return 0; return 0;
} }
static void fsck_index(struct index_state *istate)
{
unsigned int i;
/* TODO: audit for interaction with sparse-index. */
ensure_full_index(istate);
for (i = 0; i < istate->cache_nr; i++) {
unsigned int mode;
struct blob *blob;
struct object *obj;
mode = istate->cache[i]->ce_mode;
if (S_ISGITLINK(mode))
continue;
blob = lookup_blob(the_repository,
&istate->cache[i]->oid);
if (!blob)
continue;
obj = &blob->object;
obj->flags |= USED;
fsck_put_object_name(&fsck_walk_options, &obj->oid,
":%s", istate->cache[i]->name);
mark_object_reachable(obj);
}
if (istate->cache_tree)
fsck_cache_tree(istate->cache_tree);
fsck_resolve_undo(istate);
}
static void mark_object_for_connectivity(const struct object_id *oid) static void mark_object_for_connectivity(const struct object_id *oid)
{ {
struct object *obj = lookup_unknown_object(the_repository, oid); struct object *obj = lookup_unknown_object(the_repository, oid);
@ -959,29 +987,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
verify_index_checksum = 1; verify_index_checksum = 1;
verify_ce_order = 1; verify_ce_order = 1;
repo_read_index(the_repository); repo_read_index(the_repository);
/* TODO: audit for interaction with sparse-index. */ fsck_index(the_repository->index);
ensure_full_index(&the_index);
for (i = 0; i < the_index.cache_nr; i++) {
unsigned int mode;
struct blob *blob;
struct object *obj;
mode = the_index.cache[i]->ce_mode;
if (S_ISGITLINK(mode))
continue;
blob = lookup_blob(the_repository,
&the_index.cache[i]->oid);
if (!blob)
continue;
obj = &blob->object;
obj->flags |= USED;
fsck_put_object_name(&fsck_walk_options, &obj->oid,
":%s", the_index.cache[i]->name);
mark_object_reachable(obj);
}
if (the_index.cache_tree)
fsck_cache_tree(the_index.cache_tree);
fsck_resolve_undo(&the_index);
} }
check_connectivity(); check_connectivity();