]> git.ipfire.org Git - thirdparty/git.git/commit
t3310: stop checking for reference existence via `test -f`
authorPatrick Steinhardt <ps@pks.im>
Wed, 29 Nov 2023 07:25:01 +0000 (08:25 +0100)
committerJunio C Hamano <gitster@pobox.com>
Sun, 3 Dec 2023 02:50:24 +0000 (11:50 +0900)
commit110feb893a16c009ffc8771b4204b2dc5c54c8c6
tree1b6333c7fef6abb1fee5e7082151f000b9fd6b49
parent7e1fcb81eef3be73890d7c469da508b9bf3327b5
t3310: stop checking for reference existence via `test -f`

One of the tests in t3310 exercises whether the special references
`NOTES_MERGE_PARTIAL` and `NOTES_MERGE_REF` exist as expected when the
notes subsystem runs into a merge conflict. This is done by checking
on-disk data structures directly though instead of asking the reference
backend.

Refactor the test to use git-rev-parse(1) instead.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3310-notes-merge-manual-resolve.sh