From: Andy Koppe Date: Sun, 01 Nov 2026 23:03:23 GMT Subject: [PATCH v2 5/5] t: stop calling root refs pseudorefs Message-ID: <20261101230326.3675597-6-andy.koppe@gmail.com> In-Reply-To: <20261022212903.177261-1-andy.koppe@gmail.com> Several test titles and comments still use "pseudoref" in its old sense of any ref outside of "refs/", which the glossary now calls root refs. Replace "pseudoref" with "root ref" there. In t1400 and t4013, rename the root refs that the tests create from PSEUDOREF to ROOT_REF_HEAD and from REVERSE to REVERSE_HEAD, so that they follow the naming rules for root refs. This includes renaming the expected output file in t4013. Some tests also still refer to FETCH_HEAD and MERGE_HEAD as "special refs", which was the previous term for "pseudorefs". Correct them. Signed-off-by: Andy Koppe --- t/show-ref-exists-tests.sh | 4 +- t/t0600-reffiles-backend.sh | 2 +- t/t0610-reftable-basics.sh | 2 +- t/t1400-update-ref.sh | 66 +++++++++---------- t/t1403-show-ref.sh | 2 +- t/t1460-refs-migrate.sh | 4 +- t/t4013-diff-various.sh | 6 +- ...iff.diff-tree_--cc_--summary_REVERSE_HEAD} | 2 +- t/t6302-for-each-ref-filter.sh | 4 +- t/t9902-completion.sh | 4 +- 10 files changed, 48 insertions(+), 48 deletions(-) rename t/t4013/{diff.diff-tree_--cc_--summary_REVERSE => diff.diff-tree_--cc_--summary_REVERSE_HEAD} (73%) diff --git a/t/show-ref-exists-tests.sh b/t/show-ref-exists-tests.sh index 1351f690eb..d4a021a0c6 100644 --- a/t/show-ref-exists-tests.sh +++ b/t/show-ref-exists-tests.sh @@ -64,11 +64,11 @@ 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_success '--exists with non-existent pseudoref' ' test_expect_code 2 ${git_show_ref_exists} FETCH_HEAD ' -test_expect_success '--exists with existing special ref' ' +test_expect_success '--exists with existing pseudoref' ' test_when_finished "rm .git/FETCH_HEAD" && git rev-parse HEAD >.git/FETCH_HEAD && ${git_show_ref_exists} FETCH_HEAD diff --git a/t/t0600-reffiles-backend.sh b/t/t0600-reffiles-backend.sh index 62b0851852..26385aab7d 100755 --- a/t/t0600-reffiles-backend.sh +++ b/t/t0600-reffiles-backend.sh @@ -267,7 +267,7 @@ test_expect_success 'setup worktree' ' ) ' -# Some refs (refs/bisect/*, pseudorefs) are kept per worktree, so they should +# Some refs (refs/bisect/*, root refs) are kept per worktree, so they should # only appear in the for-each-reflog output if it is called from the correct # worktree, which is exercised in this test. This test is poorly written for # multiple reasons: 1) it creates invalidly formatted log entries. 2) it uses diff --git a/t/t0610-reftable-basics.sh b/t/t0610-reftable-basics.sh index a702745839..01a0310762 100755 --- a/t/t0610-reftable-basics.sh +++ b/t/t0610-reftable-basics.sh @@ -1156,7 +1156,7 @@ test_expect_success 'worktree: adds worktree with detached HEAD' ' test_cmp expect actual ' -test_expect_success 'fetch: accessing FETCH_HEAD special ref works' ' +test_expect_success 'fetch: accessing FETCH_HEAD pseudoref works' ' test_when_finished "rm -rf repo sub" && git init sub && diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh index 1a164c96f9..95a617254b 100755 --- a/t/t1400-update-ref.sh +++ b/t/t1400-update-ref.sh @@ -503,61 +503,61 @@ test_expect_success 'git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)' test OTHER = $(git cat-file blob "main@{2005-05-26 23:42}:F") ' -# Test adding and deleting pseudorefs +# Test adding and deleting root refs -test_expect_success 'given old value for missing pseudoref, do not create' ' - test_must_fail git update-ref PSEUDOREF $A $B 2>err && - test_must_fail git rev-parse PSEUDOREF && +test_expect_success 'given old value for missing root ref, do not create' ' + test_must_fail git update-ref ROOT_REF_HEAD $A $B 2>err && + test_must_fail git rev-parse ROOT_REF_HEAD && test_grep "unable to resolve reference" err ' -test_expect_success 'create pseudoref' ' - git update-ref PSEUDOREF $A && - test $A = $(git show-ref -s --verify PSEUDOREF) +test_expect_success 'create root ref' ' + git update-ref ROOT_REF_HEAD $A && + test $A = $(git show-ref -s --verify ROOT_REF_HEAD) ' -test_expect_success 'overwrite pseudoref with no old value given' ' - git update-ref PSEUDOREF $B && - test $B = $(git show-ref -s --verify PSEUDOREF) +test_expect_success 'overwrite root ref with no old value given' ' + git update-ref ROOT_REF_HEAD $B && + test $B = $(git show-ref -s --verify ROOT_REF_HEAD) ' -test_expect_success 'overwrite pseudoref with correct old value' ' - git update-ref PSEUDOREF $C $B && - test $C = $(git show-ref -s --verify PSEUDOREF) +test_expect_success 'overwrite root ref with correct old value' ' + git update-ref ROOT_REF_HEAD $C $B && + test $C = $(git show-ref -s --verify ROOT_REF_HEAD) ' -test_expect_success 'do not overwrite pseudoref with wrong old value' ' - test_must_fail git update-ref PSEUDOREF $D $E 2>err && - test $C = $(git show-ref -s --verify PSEUDOREF) && +test_expect_success 'do not overwrite root ref with wrong old value' ' + test_must_fail git update-ref ROOT_REF_HEAD $D $E 2>err && + test $C = $(git show-ref -s --verify ROOT_REF_HEAD) && test_grep "cannot lock ref.*expected" err ' -test_expect_success 'delete pseudoref' ' - git update-ref -d PSEUDOREF && - test_must_fail git show-ref -s --verify PSEUDOREF +test_expect_success 'delete root ref' ' + git update-ref -d ROOT_REF_HEAD && + test_must_fail git show-ref -s --verify ROOT_REF_HEAD ' -test_expect_success 'do not delete pseudoref with wrong old value' ' - git update-ref PSEUDOREF $A && - test_must_fail git update-ref -d PSEUDOREF $B 2>err && - test $A = $(git show-ref -s --verify PSEUDOREF) && +test_expect_success 'do not delete root ref with wrong old value' ' + git update-ref ROOT_REF_HEAD $A && + test_must_fail git update-ref -d ROOT_REF_HEAD $B 2>err && + test $A = $(git show-ref -s --verify ROOT_REF_HEAD) && test_grep "cannot lock ref.*expected" err ' -test_expect_success 'delete pseudoref with correct old value' ' - git update-ref -d PSEUDOREF $A && - test_must_fail git show-ref -s --verify PSEUDOREF +test_expect_success 'delete root ref with correct old value' ' + git update-ref -d ROOT_REF_HEAD $A && + test_must_fail git show-ref -s --verify ROOT_REF_HEAD ' -test_expect_success 'create pseudoref with old OID zero' ' - git update-ref PSEUDOREF $A $Z && - test $A = $(git show-ref -s --verify PSEUDOREF) +test_expect_success 'create root ref with old OID zero' ' + git update-ref ROOT_REF_HEAD $A $Z && + test $A = $(git show-ref -s --verify ROOT_REF_HEAD) ' -test_expect_success 'do not overwrite pseudoref with old OID zero' ' - test_when_finished git update-ref -d PSEUDOREF && - test_must_fail git update-ref PSEUDOREF $B $Z 2>err && - test $A = $(git show-ref -s --verify PSEUDOREF) && +test_expect_success 'do not overwrite root ref with old OID zero' ' + test_when_finished git update-ref -d ROOT_REF_HEAD && + test_must_fail git update-ref ROOT_REF_HEAD $B $Z 2>err && + test $A = $(git show-ref -s --verify ROOT_REF_HEAD) && test_grep "already exists" err ' diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh index 226b3ec0e8..38648fd560 100755 --- a/t/t1403-show-ref.sh +++ b/t/t1403-show-ref.sh @@ -181,7 +181,7 @@ test_expect_success 'show-ref --verify HEAD' ' test_must_be_empty actual ' -test_expect_success 'show-ref --verify pseudorefs' ' +test_expect_success 'show-ref --verify root refs' ' git update-ref CHERRY_PICK_HEAD HEAD $ZERO_OID && test_when_finished "git update-ref -d CHERRY_PICK_HEAD" && git show-ref -s --verify HEAD >actual && diff --git a/t/t1460-refs-migrate.sh b/t/t1460-refs-migrate.sh index ecf6411288..1f59d820a0 100755 --- a/t/t1460-refs-migrate.sh +++ b/t/t1460-refs-migrate.sh @@ -170,7 +170,7 @@ do test_cmp expect actual ' - test_expect_success "$from_format -> $to_format: pseudo-refs" ' + test_expect_success "$from_format -> $to_format: root refs" ' test_when_finished "rm -rf repo" && git init --ref-storage-format=$from_format repo && test_commit -C repo initial && @@ -178,7 +178,7 @@ do test_migration repo "$to_format" ' - test_expect_success "$from_format -> $to_format: special refs are left alone" ' + test_expect_success "$from_format -> $to_format: pseudorefs are left alone" ' test_when_finished "rm -rf repo" && git init --ref-storage-format=$from_format repo && test_commit -C repo initial && diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh index 21c9ad7c5d..43a9bf6d7c 100755 --- a/t/t4013-diff-various.sh +++ b/t/t4013-diff-various.sh @@ -115,10 +115,10 @@ test_expect_success setup ' git checkout -f main && # Same merge as main, but with parents reversed. Hide it in a - # pseudo-ref to avoid impacting tests with --all. + # root ref to avoid impacting tests with --all. commit=$(echo reverse | git commit-tree -p main^2 -p main^1 main^{tree}) && - git update-ref REVERSE $commit && + git update-ref REVERSE_HEAD $commit && git config diff.renames false && @@ -328,7 +328,7 @@ diff-tree --cc --stat --summary main diff-tree -c --stat --summary side diff-tree --cc --stat --summary side diff-tree --cc --shortstat main -diff-tree --cc --summary REVERSE +diff-tree --cc --summary REVERSE_HEAD # improved by Timo's patch diff-tree --cc --patch-with-stat main # improved by Timo's patch diff --git a/t/t4013/diff.diff-tree_--cc_--summary_REVERSE b/t/t4013/diff.diff-tree_--cc_--summary_REVERSE_HEAD similarity index 73% rename from t/t4013/diff.diff-tree_--cc_--summary_REVERSE rename to t/t4013/diff.diff-tree_--cc_--summary_REVERSE_HEAD index e208dd5682..0f86ae60db 100644 --- a/t/t4013/diff.diff-tree_--cc_--summary_REVERSE +++ b/t/t4013/diff.diff-tree_--cc_--summary_REVERSE_HEAD @@ -1,4 +1,4 @@ -$ git diff-tree --cc --summary REVERSE +$ git diff-tree --cc --summary REVERSE_HEAD 2562325a7ee916efb2481da93073b82cec801cbc create mode 100644 file1 delete mode 100644 file2 diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh index a2fc257f98..5a6d6fef55 100755 --- a/t/t6302-for-each-ref-filter.sh +++ b/t/t6302-for-each-ref-filter.sh @@ -31,7 +31,7 @@ test_expect_success 'setup some history and refs' ' git update-ref refs/odd/spot main ' -test_expect_success '--include-root-refs pattern prints pseudorefs' ' +test_expect_success '--include-root-refs pattern prints root refs' ' cat >expect <<-\EOF && HEAD ORIG_HEAD @@ -52,7 +52,7 @@ test_expect_success '--include-root-refs pattern prints pseudorefs' ' test_cmp expect actual ' -test_expect_success '--include-root-refs pattern does not print special refs' ' +test_expect_success '--include-root-refs pattern does not print pseudorefs' ' test_when_finished "rm -rf repo" && git init repo && ( diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index f6de74054a..1cb55f9301 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -2693,13 +2693,13 @@ test_expect_success 'checkout matches case insensitively with GIT_COMPLETION_IGN ) ' -test_expect_success 'checkout completes pseudo refs' ' +test_expect_success 'checkout completes root refs' ' test_completion "git checkout H" <<-\EOF HEAD Z EOF ' -test_expect_success 'checkout completes pseudo refs case insensitively with GIT_COMPLETION_IGNORE_CASE' ' +test_expect_success 'checkout completes root refs case insensitively with GIT_COMPLETION_IGNORE_CASE' ' ( GIT_COMPLETION_IGNORE_CASE=1 && test_completion "git checkout h" <<-\EOF -- 2.56.0