mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'hn/reftable-tests'

Browse Source 
Prepare more test scripts for the introduction of reftable.

* hn/reftable-tests:
  t5312: prepare for reftable
  t1405: mark test that checks existence as REFFILES
  t1405: explictly delete reflogs for reftable
This commit is contained in:
Junio C Hamano
2022-02-17 16:25:04 -08:00
parent 0ac270cf7c eaf0e83009
commit 75ff34bcf7
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/t1405-main-ref-store.sh
View File

@ -40,6 +40,12 @@ test_expect_success 'delete_refs(FOO, refs/tags/new-tag)' '
test_must_fail git rev-parse refs/tags/new-tag -- test_must_fail git rev-parse refs/tags/new-tag --
' '
# In reftable, we keep the reflogs around for deleted refs.
test_expect_success !REFFILES 'delete-reflog(FOO, refs/tags/new-tag)' '
$RUN delete-reflog FOO &&
$RUN delete-reflog refs/tags/new-tag
'
test_expect_success 'rename_refs(main, new-main)' ' test_expect_success 'rename_refs(main, new-main)' '
git rev-parse main >expected && git rev-parse main >expected &&
$RUN rename-ref refs/heads/main refs/heads/new-main && $RUN rename-ref refs/heads/main refs/heads/new-main &&
@ -105,7 +111,7 @@ test_expect_success 'delete_reflog(HEAD)' '
test_must_fail git reflog exists HEAD test_must_fail git reflog exists HEAD
' '
test_expect_success 'create-reflog(HEAD)' ' test_expect_success REFFILES 'create-reflog(HEAD)' '
$RUN create-reflog HEAD && $RUN create-reflog HEAD &&
git reflog exists HEAD git reflog exists HEAD
' '

10
t/t5312-prune-corruption.sh
View File

@ -22,8 +22,8 @@ test_expect_success 'disable reflogs' '
' '
create_bogus_ref () { create_bogus_ref () {
test_when_finished 'rm -f .git/refs/heads/bogus..name' && test-tool ref-store main update-ref msg "refs/heads/bogus..name" $bogus $ZERO_OID REF_SKIP_REFNAME_VERIFICATION &&
echo $bogus >.git/refs/heads/bogus..name test_when_finished "test-tool ref-store main delete-refs REF_NO_DEREF msg refs/heads/bogus..name"
} }
test_expect_success 'create history reachable only from a bogus-named ref' ' test_expect_success 'create history reachable only from a bogus-named ref' '
@ -113,7 +113,7 @@ test_expect_success 'pack-refs does not silently delete broken loose ref' '
# we do not want to count on running pack-refs to # we do not want to count on running pack-refs to
# actually pack it, as it is perfectly reasonable to # actually pack it, as it is perfectly reasonable to
# skip processing a broken ref # skip processing a broken ref
test_expect_success 'create packed-refs file with broken ref' ' test_expect_success REFFILES 'create packed-refs file with broken ref' '
rm -f .git/refs/heads/main && rm -f .git/refs/heads/main &&
cat >.git/packed-refs <<-EOF && cat >.git/packed-refs <<-EOF &&
$missing refs/heads/main $missing refs/heads/main
@ -124,13 +124,13 @@ test_expect_success 'create packed-refs file with broken ref' '
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'pack-refs does not silently delete broken packed ref' ' test_expect_success REFFILES 'pack-refs does not silently delete broken packed ref' '
git pack-refs --all --prune && git pack-refs --all --prune &&
git rev-parse refs/heads/main >actual && git rev-parse refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual
' '
test_expect_success 'pack-refs does not drop broken refs during deletion' ' test_expect_success REFFILES 'pack-refs does not drop broken refs during deletion' '
git update-ref -d refs/heads/other && git update-ref -d refs/heads/other &&
git rev-parse refs/heads/main >actual && git rev-parse refs/heads/main >actual &&
test_cmp expect actual test_cmp expect actual