diff options
author | Patrick Steinhardt <ps@pks.im> | 2024-02-15 09:25:51 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2024-02-15 19:12:30 +0100 |
commit | f85a032c676b818851926044aaea2e9065acdaa2 (patch) | |
tree | 2583998cc8a0c63482fe549be7ea845776fbb964 /t/t7003-filter-branch.sh | |
parent | t1405: remove unneeded cleanup step (diff) | |
download | git-f85a032c676b818851926044aaea2e9065acdaa2.tar.xz git-f85a032c676b818851926044aaea2e9065acdaa2.zip |
t2011: exercise D/F conflicts with HEAD with the reftable backend
Some of the tests in t2011 exercise whether it is possible to move away
from a symbolic HEAD ref whose target ref has a directory-file conflict
with another, preexisting ref. These tests don't use git-symbolic-ref(1)
but manually write HEAD. This is supposedly done to avoid using logic
that we're about to exercise, but it makes it impossible to verify
whether the logic also works for ref backends other than "files".
Refactor the code to use git-symbolic-ref(1) instead so that the tests
work with the "reftable" backend, as well. We already have lots of tests
in t1404 that ensure that both git-update-ref(1) and git-symbolic-ref(1)
work in such a scenario, so it should be safe to rely on it here.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7003-filter-branch.sh')
0 files changed, 0 insertions, 0 deletions