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 <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Oct 23, 2020 at 13:59 UTC
25ad0dc1307412bb25344db017c0e942529cbd6d
1 file changed
+6
-6
t/t9801-git-p4-branch.sh
+6
-6
@@ -67,7 +67,7 @@ test_expect_success 'import main, no branch detection' '
67
(
68
cd "$git" &&
69
git log --oneline --graph --decorate --all &&
70
- git rev-list master >wc &&
70
+ git rev-list master -- >wc &&
71
test_line_count = 4 wc
72
)
73
'
@@ -78,7 +78,7 @@ test_expect_success 'import branch1, no branch detection' '
78
(
79
cd "$git" &&
80
git log --oneline --graph --decorate --all &&
81
- git rev-list master >wc &&
81
+ git rev-list master -- >wc &&
82
test_line_count = 2 wc
83
)
84
'
@@ -89,7 +89,7 @@ test_expect_success 'import branch2, no branch detection' '
89
(
90
cd "$git" &&
91
git log --oneline --graph --decorate --all &&
92
- git rev-list master >wc &&
92
+ git rev-list master -- >wc &&
93
test_line_count = 2 wc
94
)
95
'
@@ -100,7 +100,7 @@ test_expect_success 'import depot, no branch detection' '
100
(
101
cd "$git" &&
102
git log --oneline --graph --decorate --all &&
103
- git rev-list master >wc &&
103
+ git rev-list master -- >wc &&
104
test_line_count = 8 wc
105
)
106
'
@@ -114,7 +114,7 @@ test_expect_success 'import depot, branch detection' '
114
git log --oneline --graph --decorate --all &&
115
116
# 4 main commits
117
- git rev-list master >wc &&
117
+ git rev-list master -- >wc &&
118
test_line_count = 4 wc &&
119
120
# 3 main, 1 integrate, 1 on branch2
@@ -137,7 +137,7 @@ test_expect_success 'import depot, branch detection, branchList branch definitio
137
git log --oneline --graph --decorate --all &&
138
139
# 4 main commits
140
- git rev-list master >wc &&
140
+ git rev-list master -- >wc &&
141
test_line_count = 4 wc &&
142
143
# 3 main, 1 integrate, 1 on branch2