diff options
| author | Junio C Hamano <gitster@pobox.com> | 2024-01-03 00:51:30 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-01-03 00:51:30 +0300 |
| commit | dbf668a1b7d814b4fcb57c292934cbbc2d926490 (patch) | |
| tree | 147f6a9d23df350ae6c8e24094a4c973e306ad2c /t | |
| parent | 601b1571e8e61e7dc1473a6d5049261a9524f381 (diff) | |
| parent | 0a06892ddde5bc3a82a4fe2963e3ea294252ffdd (diff) | |
Merge branch 'ps/pseudo-refs'
Assorted changes around pseudoref handling.
* ps/pseudo-refs:
bisect: consistently write BISECT_EXPECTED_REV via the refdb
refs: complete list of special refs
refs: propagate errno when reading special refs fails
wt-status: read HEAD and ORIG_HEAD via the refdb
Diffstat (limited to 't')
| -rwxr-xr-x | t/t1403-show-ref.sh | 10 | ||||
| -rwxr-xr-x | t/t6030-bisect-porcelain.sh | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh index d477689e33..ec1957b709 100755 --- a/t/t1403-show-ref.sh +++ b/t/t1403-show-ref.sh @@ -268,4 +268,14 @@ test_expect_success '--exists with directory fails with generic error' ' test_cmp expect err ' +test_expect_success '--exists with non-existent special ref' ' + test_expect_code 2 git show-ref --exists FETCH_HEAD +' + +test_expect_success '--exists with existing special ref' ' + test_when_finished "rm .git/FETCH_HEAD" && + git rev-parse HEAD >.git/FETCH_HEAD && + git show-ref --exists FETCH_HEAD +' + test_done diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh index 7b24d1684e..561080bf24 100755 --- a/t/t6030-bisect-porcelain.sh +++ b/t/t6030-bisect-porcelain.sh @@ -1182,7 +1182,7 @@ test_expect_success 'git bisect reset cleans bisection state properly' ' git bisect bad $HASH4 && git bisect reset && test -z "$(git for-each-ref "refs/bisect/*")" && - test_path_is_missing ".git/BISECT_EXPECTED_REV" && + test_ref_missing BISECT_EXPECTED_REV && test_path_is_missing ".git/BISECT_ANCESTORS_OK" && test_path_is_missing ".git/BISECT_LOG" && test_path_is_missing ".git/BISECT_RUN" && |