eyecatchu/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-11 21:33:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

refs/files: remove empty parent dirs when ref creation fails

Browse Source 
When creating a new reference in the "files" backend we first create the
directory hierarchy for that reference, then create the lockfile for
that reference, and finally rename the lockfile into place. When the
transaction gets aborted we prune the lockfile, but we don't clean up
the directory hierarchy that we may have created for the lockfile.

In some egde cases this can lead to lots of empty directories being
cluttered in the ".git/refs" directory that really serve no purpose at
all. We know to prune such empty directories when packing refs, but that
only patches over the issue.

Improve this by removing empty parents when cleaning up still-locked
references in `files_transaction_cleanup()`. This function is also
called when preparing or committing the transaction, so this change also
helps when not explicitly aborting the transaction.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2025-07-08 12:19:54 +02:00 committed by Junio C Hamano
parent 16bd9f20a4
commit a3a7f20516
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
refs/files-backend.c
View File

@ -2760,6 +2760,8 @@ static void files_transaction_cleanup(struct files_ref_store *refs,
if (lock) {
unlock_ref(lock);
try_remove_empty_parents(refs, update->refname,
REMOVE_EMPTY_PARENTS_REF);
update->backend_data = NULL;
}
}

19
t/t1400-update-ref.sh
View File

@ -2310,4 +2310,23 @@ test_expect_success 'update-ref should also create reflog for HEAD' '
test_cmp expect actual
'
test_expect_success REFFILES 'empty directories are pruned when aborting a transaction' '
test_path_is_missing .git/refs/heads/nested &&
git update-ref --stdin <<-EOF &&
create refs/heads/nested/something HEAD
prepare
abort
EOF
test_path_is_missing .git/refs/heads/nested
'
test_expect_success REFFILES 'empty directories are pruned when not committing' '
test_path_is_missing .git/refs/heads/nested &&
git update-ref --stdin <<-EOF &&
create refs/heads/nested/something HEAD
prepare
EOF
test_path_is_missing .git/refs/heads/nested
'
test_done