Merge branch 'jk/prune-top-level-refs-after-packing'

After "pack-refs --prune" packed refs at the top-level, it failed
to prune them.

* jk/prune-top-level-refs-after-packing:
  pack-refs: prune top-level refs like "refs/foo"
This commit is contained in:
Junio C Hamano 2014-09-11 10:33:33 -07:00
Родитель bedd3b4b7b afd11d3ebc
Коммит 88e7dff93d
2 изменённых файлов: 8 добавлений и 1 удалений

2
refs.c
Просмотреть файл

@ -2389,7 +2389,7 @@ static void prune_ref(struct ref_to_prune *r)
struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT;
if (check_refname_format(r->name + 5, 0))
if (check_refname_format(r->name, 0))
return;
transaction = ref_transaction_begin(&err);

Просмотреть файл

@ -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