mirrors/git
0
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-24 10:26:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ab/reflog-prep-fix'

Browse Source 
Regression fix.

* ab/reflog-prep-fix:
  reflog: don't be noisy on empty reflogs
This commit is contained in:
Junio C Hamano 2022-03-23 14:09:30 -07:00
commit 7f7d1ad3e0
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reflog.c
View File

@ -334,6 +334,8 @@ void reflog_expiry_prepare(const char *refname,
cb->unreachable_expire_kind = UE_HEAD; cb->unreachable_expire_kind = UE_HEAD;
} else { } else {
commit = lookup_commit(the_repository, oid); 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; cb->unreachable_expire_kind = commit ? UE_NORMAL : UE_ALWAYS;
} }

9
t/t1410-reflog.sh
View File

@ -423,4 +423,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 test_done