Skip to content

Commit 25ad0dc

Browse files
dschogitster
authored andcommitted
t9801: use -- in preparation for default branch rename
Seeing as we want to use `main` as the new default branch name used by `git init`, and that `main` is used as directory name in t9801, let's tighten the rev-list arguments to make it explicit when we are referring to a ref instead of a directory. Signed-off-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2217230 commit 25ad0dc

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

t/t9801-git-p4-branch.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ test_expect_success 'import main, no branch detection' '
6767
(
6868
cd "$git" &&
6969
git log --oneline --graph --decorate --all &&
70-
git rev-list master >wc &&
70+
git rev-list master -- >wc &&
7171
test_line_count = 4 wc
7272
)
7373
'
@@ -78,7 +78,7 @@ test_expect_success 'import branch1, no branch detection' '
7878
(
7979
cd "$git" &&
8080
git log --oneline --graph --decorate --all &&
81-
git rev-list master >wc &&
81+
git rev-list master -- >wc &&
8282
test_line_count = 2 wc
8383
)
8484
'
@@ -89,7 +89,7 @@ test_expect_success 'import branch2, no branch detection' '
8989
(
9090
cd "$git" &&
9191
git log --oneline --graph --decorate --all &&
92-
git rev-list master >wc &&
92+
git rev-list master -- >wc &&
9393
test_line_count = 2 wc
9494
)
9595
'
@@ -100,7 +100,7 @@ test_expect_success 'import depot, no branch detection' '
100100
(
101101
cd "$git" &&
102102
git log --oneline --graph --decorate --all &&
103-
git rev-list master >wc &&
103+
git rev-list master -- >wc &&
104104
test_line_count = 8 wc
105105
)
106106
'
@@ -114,7 +114,7 @@ test_expect_success 'import depot, branch detection' '
114114
git log --oneline --graph --decorate --all &&
115115
116116
# 4 main commits
117-
git rev-list master >wc &&
117+
git rev-list master -- >wc &&
118118
test_line_count = 4 wc &&
119119
120120
# 3 main, 1 integrate, 1 on branch2
@@ -137,7 +137,7 @@ test_expect_success 'import depot, branch detection, branchList branch definitio
137137
git log --oneline --graph --decorate --all &&
138138
139139
# 4 main commits
140-
git rev-list master >wc &&
140+
git rev-list master -- >wc &&
141141
test_line_count = 4 wc &&
142142
143143
# 3 main, 1 integrate, 1 on branch2

0 commit comments

Comments
 (0)