]> git.ipfire.org Git - thirdparty/git.git/commitdiff
fsck: use local repository
authorDerrick Stolee <derrickstolee@github.com>
Tue, 2 May 2023 13:27:22 +0000 (13:27 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 May 2023 15:48:23 +0000 (08:48 -0700)
In 0d30feef3c5 (fsck: create scaffolding for rev-index checks,
2023-04-17) and later 5a6072f631d (fsck: validate .rev file header,
2023-04-17), the check_pack_rev_indexes() method was created with a
'struct repository *r' parameter. However, this parameter was unused and
instead 'the_repository' was used in its place.

Fix this situation with the obvious replacement.

Signed-off-by: Derrick Stolee <derrickstolee@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fsck.c

index 75b30d1d00c538a19fdeda4c330ebe32b9427dbf..dcc165bf0c508da9b0ebe238a83fc5861def40c7 100644 (file)
@@ -869,20 +869,20 @@ static int check_pack_rev_indexes(struct repository *r, int show_progress)
        int res = 0;
 
        if (show_progress) {
-               for (struct packed_git *p = get_all_packs(the_repository); p; p = p->next)
+               for (struct packed_git *p = get_all_packs(r); p; p = p->next)
                        pack_count++;
                progress = start_delayed_progress("Verifying reverse pack-indexes", pack_count);
                pack_count = 0;
        }
 
-       for (struct packed_git *p = get_all_packs(the_repository); p; p = p->next) {
+       for (struct packed_git *p = get_all_packs(r); p; p = p->next) {
                int load_error = load_pack_revindex_from_disk(p);
 
                if (load_error < 0) {
                        error(_("unable to load rev-index for pack '%s'"), p->pack_name);
                        res = ERROR_PACK_REV_INDEX;
                } else if (!load_error &&
-                          !load_pack_revindex(the_repository, p) &&
+                          !load_pack_revindex(r, p) &&
                           verify_pack_revindex(p)) {
                        error(_("invalid rev-index for pack '%s'"), p->pack_name);
                        res = ERROR_PACK_REV_INDEX;