diff options
| -rw-r--r-- | builtin/reflog.c | 2 | ||||
| -rwxr-xr-x | t/t1410-reflog.sh | 9 |
2 files changed, 11 insertions, 0 deletions
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 |