[GSoC] [PATCH v4 1/1] Remove the pipe following the `git tag`, ensuring the exit code is not hidden. Add explicit verification to check for expected and unexpected tags, increasing specificity and future-proofing a portion of the test.
Signed-off-by: Anthony Wang <anthonywang513@gmail.com>
---
t/t9811-git-p4-label-import.sh | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh
index 5ac5383fb7..cd06f39519 100755
--- a/t/t9811-git-p4-label-import.sh
+++ b/t/t9811-git-p4-label-import.sh
@@ -95,9 +95,10 @@ test_expect_success 'two labels on the same changelist' '
cd "$git" &&
git p4 sync --import-labels &&
- git tag | grep TAG_F1 &&
- git tag | grep -q TAG_F1_1 &&
- git tag | grep -q TAG_F1_2 &&
+ git tag &&
+ git show-ref --verify refs/tags/TAG_F1_1 &&
+ git show-ref --verify refs/tags/TAG_F1_2 &&
+ test_must_fail git show-ref --verify refs/tags/TAG_F1_ONLY &&
cd main &&
@@ -208,7 +209,7 @@ test_expect_success 'use git config to enable import/export of tags' '
git p4 rebase --verbose &&
git p4 submit --verbose &&
git tag &&
- git tag | grep TAG_F1_1
+ git show-ref --verify refs/tags/TAG_F1_1 &&
) &&
(
cd "$cli" &&
--
2.39.5 (Apple Git-154)
Anthony Wang <anthonywang513@gmail.com>