diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-08-14 14:54:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-08-14 14:54:55 -0700 |
| commit | 494c9788e40dab99492f10658852010f4a31d358 (patch) | |
| tree | fae63c45af76f374c65668df9cd257573e555777 /reflog.c | |
| parent | 7a95eceb6b015c2d34c42a45c9354b83539f957d (diff) | |
| parent | 5133ead5286546d65b038b9381ef8b1cd4663c0b (diff) | |
| download | git-494c9788e40dab99492f10658852010f4a31d358.tar.gz | |
Merge branch 'jc/reflog-expire-lookup-commit-fix'
"git reflog expire" failed to honor annotated tags when computing
reachable commits.
* jc/reflog-expire-lookup-commit-fix:
Revert "reflog expire: don't use lookup_commit_reference_gently()"
Diffstat (limited to 'reflog.c')
| -rw-r--r-- | reflog.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -332,7 +332,8 @@ void reflog_expiry_prepare(const char *refname, if (!cb->cmd.expire_unreachable || is_head(refname)) { cb->unreachable_expire_kind = UE_HEAD; } else { - commit = lookup_commit(the_repository, oid); + commit = lookup_commit_reference_gently(the_repository, + oid, 1); if (commit && is_null_oid(&commit->object.oid)) commit = NULL; cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS; |