[PATCH 07/23] fsck: stop checking tag->tagged
- From
Jeff King <peff@peff.net>
- Date
- Oct 18, 2019, 04:51 UTC
- Message-ID
- <20191018045118.GG17879@sigill.intra.peff.net>
- In-Reply-To
- <20191018044103.GA17625@sigill.intra.peff.net>
Way back in 92d4c85d24 (fsck-cache: fix SIGSEGV on bad tag object, 2005-05-03), we added an fsck check that the "tagged" field of a tag struct isn't NULL. But that was mainly protecting the printing code for "--tags", and that code wasn't moved along with the check as part of ba002f3b28 (builtin-fsck: move common object checking code to fsck.c, 2008-02-25).
It could also serve to detect type mismatch problems (where a tag points to object X as a commit, but really X is a blob), but it couldn't do so reliably (we'd call lookup_commit(X), but it will only notice the problem if we happen to have previously called lookup_blob(X) in the same process). And as of a commit earlier in this series, we'd consider that a parse error and complain about the object even before getting to this point anyway.
So let's drop this "tag->tagged" check. It's not helping anything, and getting rid of it makes the function conceptually cleaner, as it really is just checking the buffer we feed it. In fact, we can get rid of our one-line wrapper and just unify fsck_tag() and fsck_tag_buffer().
Signed-off-by: Jeff King <peff@peff.net> --- fsck.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
diff --git a/fsck.c b/fsck.c index a0f8ae7650..79ce3a97c8 100644 --- a/fsck.c +++ b/fsck.c @@ -798,8 +798,8 @@ static int fsck_commit(struct commit *commit, const char *data, return ret; } -static int fsck_tag_buffer(struct tag *tag, const char *data, - unsigned long size, struct fsck_options *options) +static int fsck_tag(struct tag *tag, const char *data, + unsigned long size, struct fsck_options *options) { struct object_id oid; int ret = 0; @@ -893,17 +893,6 @@ static int fsck_tag_buffer(struct tag *tag, const char *data, return ret; } -static int fsck_tag(struct tag *tag, const char *data, - unsigned long size, struct fsck_options *options) -{ - struct object *tagged = tag->tagged; - - if (!tagged) - return report(options, &tag->object, FSCK_MSG_BAD_TAG_OBJECT, "could not load tagged object"); - - return fsck_tag_buffer(tag, data, size, options); -} - struct fsck_gitmodules_data { struct object *obj; struct fsck_options *options;
-- 2.23.0.1228.gee29b05929