summaryrefslogtreecommitdiff
path: root/fsck.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-06-13 12:50:44 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-13 12:50:44 -0700
commitfb6ac9e79ae47aa55bb1c8b151afa770abd2a601 (patch)
tree315da2150b746c83a648741bf87c915194e5292c /fsck.c
parentRelNotes 2.18: clarify where directory rename detection applies (diff)
parentfsck: avoid looking at NULL blob->object (diff)
downloadtgif-fb6ac9e79ae47aa55bb1c8b151afa770abd2a601.tar.xz
Merge branch 'jk/submodule-fsck-loose-fixup'
Finishing touches to a topic that already is in 'maint'. * jk/submodule-fsck-loose-fixup: fsck: avoid looking at NULL blob->object t7415: don't bother creating commit for symlink test
Diffstat (limited to 'fsck.c')
-rw-r--r--fsck.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fsck.c b/fsck.c
index bcae2c30e6..48e7e36869 100644
--- a/fsck.c
+++ b/fsck.c
@@ -1036,7 +1036,8 @@ int fsck_finish(struct fsck_options *options)
blob = lookup_blob(oid);
if (!blob) {
- ret |= report(options, &blob->object,
+ struct object *obj = lookup_unknown_object(oid->hash);
+ ret |= report(options, obj,
FSCK_MSG_GITMODULES_BLOB,
"non-blob found at .gitmodules");
continue;