Browse Source

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"
maint
Junio C Hamano 11 years ago
parent
commit
88e7dff93d
  1. 2
      refs.c
  2. 7
      t/t3210-pack-refs.sh

2
refs.c

@ -2389,7 +2389,7 @@ static void prune_ref(struct ref_to_prune *r) @@ -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);

7
t/t3210-pack-refs.sh

@ -151,4 +151,11 @@ test_expect_success 'delete ref while another dangling packed ref' ' @@ -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

Loading…
Cancel
Save