Revert "reflog expire: don't use lookup_commit_reference_gently()"

During Git 2.35 timeframe, daf1d828 (reflog expire: don't use lookup_commit_reference_gently(), 2021-12-22) replaced a call to lookup_commit_reference_gently() with a call to lookup_commit(). What it failed to consider was that our refs do not necessarily point at commits (most notably, we have annotated and signed tags), and more importantly that lookup_commit() does not dereference a tag to return a commit; instead it returns NULL when a tag is given. Since the commit returned is used as a starting point for the reachability check, this ejected the commits that are reachable only by an annotated tag out of the set of reachable commits, breaking the computation to correctly implement the "--expire-unreachable" option. We also started giving an error message that the API function expected to be fed a commit object. This problem hasn't been reported or noticed for a long time, probably because the "refs/tags/" hierarchy by default is not covered by reflogs, as nobody usually moves tags. Revert the change to correctly find the commit pointed at by the ref to restore the previous behaviour, but do so only in a more modern codebase, as we had significant code churn since then and it is not grave enough to worry about for older maintenance tracks. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Jul 16, 2024 at 12:56 UTC 5133ead5286546d65b038b9381ef8b1cd4663c0b
2 files changed +10 -1
reflog.c
+2 -1
@@ -330,7 +330,8 @@ void reflog_expiry_prepare(const char *refname,
330 if (!cb->cmd.expire_unreachable || is_head(refname)) {
331 cb->unreachable_expire_kind = UE_HEAD;
332 } else {
333 - commit = lookup_commit(the_repository, oid);
333 + commit = lookup_commit_reference_gently(the_repository,
334 + oid, 1);
335 if (commit && is_null_oid(&commit->object.oid))
336 commit = NULL;
337 cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS;
t/t1410-reflog.sh
+8
@@ -146,6 +146,14 @@ test_expect_success rewind '
146 test_line_count = 5 output
147 '
148
149 +test_expect_success 'reflog expire should not barf on an annotated tag' '
150 + test_when_finished "git tag -d v0.tag || :" &&
151 + git -c core.logAllRefUpdates=always \
152 + tag -a -m "tag name" v0.tag main &&
153 + git reflog expire --dry-run refs/tags/v0.tag 2>err &&
154 + test_grep ! "error: [Oo]bject .* not a commit" err
155 +'
156 +
157 test_expect_success 'corrupt and check' '
158
159 corrupt $F &&