Skip to content

Commit dccf129

Browse files
wang-anthony03gitster
authored andcommitted
t9811: be more precise to check importing of tags
The tests use grep to search the output of `git tag` for tagnames they expect to exist, which can incorrectly pass if an unxpected tag has the expected tag as its substring. We fix this by using `git show-ref --verify` instead. Additionally, we add a negative test to verify that a possible uninteded tag does not show up in the imported repository. This change also fixes an additional problem, where piping the output of `git tag` caused the exit codes to be lost. Signed-off-by: Anthony Wang <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 485f5f8 commit dccf129

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

t/t9811-git-p4-label-import.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ test_expect_success 'two labels on the same changelist' '
9595
cd "$git" &&
9696
git p4 sync --import-labels &&
9797
98-
git tag | grep TAG_F1 &&
99-
git tag | grep -q TAG_F1_1 &&
100-
git tag | grep -q TAG_F1_2 &&
98+
git show-ref --verify refs/tags/TAG_F1_1 &&
99+
git show-ref --verify refs/tags/TAG_F1_2 &&
100+
test_must_fail git show-ref --verify refs/tags/TAG_F1_ONLY &&
101101
102102
cd main &&
103103
@@ -207,8 +207,7 @@ test_expect_success 'use git config to enable import/export of tags' '
207207
git tag CFG_A_GIT_TAG &&
208208
git p4 rebase --verbose &&
209209
git p4 submit --verbose &&
210-
git tag &&
211-
git tag | grep TAG_F1_1
210+
git show-ref --verify refs/tags/TAG_F1_1 &&
212211
) &&
213212
(
214213
cd "$cli" &&

0 commit comments

Comments
 (0)