From: Ævar Arnfjörð Bjarmason Date: Thu, 10 Mar 2022 22:56:11 +0000 (+0100) Subject: reflog: don't be noisy on empty reflogs X-Git-Tag: v2.36.0-rc0~44^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=57be9c6deeb1be7c3ce6270df52473eddc09a86c;p=thirdparty%2Fgit.git reflog: don't be noisy on empty reflogs Fix a regression in my daf1d8285ee (reflog expire: don't use lookup_commit_reference_gently(), 2021-12-22), in changing from lookup_commit_reference_gently() to lookup_commit() we stopped trying to call deref_tag() and parse_object() on the provided OID, but we also started returning non-NULL for the null_oid(). As a result we'd emit an error() via mark_reachable() later in this function as we tried to invoke parse_commit() on it. Reported-by: Johannes Sixt Signed-off-by: Ævar Arnfjörð Bjarmason Tested-by: Johannes Sixt Signed-off-by: Junio C Hamano --- diff --git a/builtin/reflog.c b/builtin/reflog.c index a4b1dd27e1..83a98cface 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -382,6 +382,8 @@ static void reflog_expiry_prepare(const char *refname, cb->unreachable_expire_kind = UE_HEAD; } else { commit = lookup_commit(the_repository, oid); + if (commit && is_null_oid(&commit->object.oid)) + commit = NULL; cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS; } diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh index d42f067ff8..7d5cfeb8bf 100755 --- a/t/t1410-reflog.sh +++ b/t/t1410-reflog.sh @@ -422,4 +422,13 @@ test_expect_success 'expire with multiple worktrees' ' ) ' +test_expect_success REFFILES 'empty reflog' ' + test_when_finished "rm -rf empty" && + git init empty && + test_commit -C empty A && + >empty/.git/logs/refs/heads/foo && + git -C empty reflog expire --all 2>err && + test_must_be_empty err +' + test_done