Skip to content

Commit a15ad5d

Browse files
dschogitster
authored andcommitted
t1415: avoid using main as ref name
In preparation for a patch series that will change the fall-back for `init.defaultBranch` to `main`, let's not use `main` as ref name in this test script. Otherwise, the `git for-each-ref ... | grep main` which wants to catch those refs would also unexpectedly catch `refs/heads/main`. Since the refs in question are worktree-local ones (i.e. each worktree has their own, just like `HEAD`), and since the test case already uses a secondary worktree called "second", let's use the name "first" for those refs instead. While at it, adjust the test titles that talk about a "repo" when they meant a "worktree" instead. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d98273b commit a15ad5d

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

t/t1415-worktree-refs.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,24 @@ test_expect_success 'reflog of worktrees/xx/HEAD' '
7676
test_cmp expected actual.wt2
7777
'
7878

79-
test_expect_success 'for-each-ref from main repo' '
79+
test_expect_success 'for-each-ref from main worktree' '
8080
mkdir fer1 &&
8181
git -C fer1 init repo &&
8282
test_commit -C fer1/repo initial &&
8383
git -C fer1/repo worktree add ../second &&
84-
git -C fer1/repo update-ref refs/bisect/main HEAD &&
85-
git -C fer1/repo update-ref refs/rewritten/main HEAD &&
86-
git -C fer1/repo update-ref refs/worktree/main HEAD &&
87-
git -C fer1/repo for-each-ref --format="%(refname)" | grep main >actual &&
84+
git -C fer1/repo update-ref refs/bisect/first HEAD &&
85+
git -C fer1/repo update-ref refs/rewritten/first HEAD &&
86+
git -C fer1/repo update-ref refs/worktree/first HEAD &&
87+
git -C fer1/repo for-each-ref --format="%(refname)" | grep first >actual &&
8888
cat >expected <<-\EOF &&
89-
refs/bisect/main
90-
refs/rewritten/main
91-
refs/worktree/main
89+
refs/bisect/first
90+
refs/rewritten/first
91+
refs/worktree/first
9292
EOF
9393
test_cmp expected actual
9494
'
9595

96-
test_expect_success 'for-each-ref from linked repo' '
96+
test_expect_success 'for-each-ref from linked worktree' '
9797
mkdir fer2 &&
9898
git -C fer2 init repo &&
9999
test_commit -C fer2/repo initial &&

0 commit comments

Comments
 (0)