diff options
| author | Patrick Steinhardt <ps@pks.im> | 2023-11-02 11:46:49 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-03 02:37:06 +0300 |
| commit | 239371168173da9a9556617fced1e053ac618a85 (patch) | |
| tree | a1477b7e865be87a040c01be3cf5eaadfb699432 /t/t3200-branch.sh | |
| parent | 1c6667cb9dab6f90dcc3381676b50b1f131aeda5 (diff) | |
t: convert tests to not access symrefs via the filesystem
Some of our tests access symbolic references via the filesystem
directly. While this works with the current files reference backend, it
this will break once we have a second reference backend in our codebase.
Refactor these tests to instead use git-symbolic-ref(1) or our
`ref-store` test tool. The latter is required in some cases where safety
checks of git-symbolic-ref(1) would otherwise reject writing a symbolic
reference.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3200-branch.sh')
| -rwxr-xr-x | t/t3200-branch.sh | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 964bc36514..1197a44fca 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -215,10 +215,13 @@ test_expect_success 'git branch -M should leave orphaned HEAD alone' ' cd orphan && test_commit initial && git checkout --orphan lonely && - grep lonely .git/HEAD && + git symbolic-ref HEAD >expect && + echo refs/heads/lonely >actual && + test_cmp expect actual && test_ref_missing refs/head/lonely && git branch -M main mistress && - grep lonely .git/HEAD + git symbolic-ref HEAD >expect && + test_cmp expect actual ) ' @@ -809,7 +812,7 @@ test_expect_success 'deleting a symref' ' test_expect_success 'deleting a dangling symref' ' git symbolic-ref refs/heads/dangling-symref nowhere && - test_path_is_file .git/refs/heads/dangling-symref && + git symbolic-ref --no-recurse refs/heads/dangling-symref && echo "Deleted branch dangling-symref (was nowhere)." >expect && git branch -d dangling-symref >actual && test_ref_missing refs/heads/dangling-symref && |