summaryrefslogtreecommitdiff
path: root/fsck.c
diff options
context:
space:
mode:
authorJonathan Tan <jonathantanmy@google.com>2021-02-22 19:20:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-02-22 20:07:40 (GMT)
commit5476e1efded571e374cd97c7d69f17962ba1c44f (patch)
tree89b90c60cb783a579dfc10e045adb1499d47ece0 /fsck.c
parentb664e9ffa153189dae9b88f32d1c5fedcf85056a (diff)
downloadgit-5476e1efded571e374cd97c7d69f17962ba1c44f.zip
git-5476e1efded571e374cd97c7d69f17962ba1c44f.tar.gz
git-5476e1efded571e374cd97c7d69f17962ba1c44f.tar.bz2
fetch-pack: print and use dangling .gitmodules
Teach index-pack to print dangling .gitmodules links after its "keep" or "pack" line instead of declaring an error, and teach fetch-pack to check such lines printed. This allows the tree side of the .gitmodules link to be in one packfile and the blob side to be in another without failing the fsck check, because it is now fetch-pack which checks such objects after all packfiles have been downloaded and indexed (and not index-pack on an individual packfile, as it is before this commit). Signed-off-by: Jonathan Tan <jonathantanmy@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fsck.c')
-rw-r--r--fsck.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fsck.c b/fsck.c
index f82e2fe..49ef656 100644
--- a/fsck.c
+++ b/fsck.c
@@ -1243,6 +1243,11 @@ int fsck_error_function(struct fsck_options *o,
return 1;
}
+void register_found_gitmodules(const struct object_id *oid)
+{
+ oidset_insert(&gitmodules_found, oid);
+}
+
int fsck_finish(struct fsck_options *options)
{
int ret = 0;