diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 14:05:12 -0700 |
| commit | fb6f843a8fbce633a4a1f39f4b7b2a862e5cb855 (patch) | |
| tree | 2fe9416be5b036455efcdc5cb14c206bdc1c7ba0 | |
| parent | 04481347eccbd797bc9f3dc49e731e3ed7d639df (diff) | |
| parent | afd11d3ebcfb18c29840dfa68be32c5215810a77 (diff) | |
| download | git-fb6f843a8fbce633a4a1f39f4b7b2a862e5cb855.tar.gz | |
Merge branch 'jk/prune-top-level-refs-after-packing' into maint
* jk/prune-top-level-refs-after-packing:
pack-refs: prune top-level refs like "refs/foo"
| -rw-r--r-- | refs.c | 3 | ||||
| -rwxr-xr-x | t/t3210-pack-refs.sh | 7 |
2 files changed, 9 insertions, 1 deletions
@@ -2387,7 +2387,8 @@ static void try_remove_empty_parents(char *name) /* make sure nobody touched the ref, and unlink */ static void prune_ref(struct ref_to_prune *r) { - struct ref_lock *lock = lock_ref_sha1(r->name + 5, r->sha1); + struct ref_lock *lock = lock_any_ref_for_update(r->name, r->sha1, + 0, NULL); if (lock) { unlink_or_warn(git_path("%s", r->name)); diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh index 1a2080e3dc..3a017bf437 100755 --- a/t/t3210-pack-refs.sh +++ b/t/t3210-pack-refs.sh @@ -151,4 +151,11 @@ test_expect_success 'delete ref while another dangling packed ref' ' test_cmp /dev/null result ' +test_expect_success 'pack ref directly below refs/' ' + git update-ref refs/top HEAD && + git pack-refs --all --prune && + grep refs/top .git/packed-refs && + test_path_is_missing .git/refs/top +' + test_done |