diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-24 17:25:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-24 17:25:32 -0700 |
| commit | 51ddc126de2f1dfe8920a83567151721ef58dde9 (patch) | |
| tree | 8ba03553d49ed903f9b7457231eb5f9f795789b1 | |
| parent | Merge branch 'jc/ci-skip-unavailable-external-software' (diff) | |
| parent | t9811: fix misconversion of tests (diff) | |
| download | git-51ddc126de2f1dfe8920a83567151721ef58dde9.tar.gz git-51ddc126de2f1dfe8920a83567151721ef58dde9.zip | |
Merge branch 'aw/t9811-modernize'
Test updates.
* aw/t9811-modernize:
t9811: fix misconversion of tests
t9811: be more precise to check importing of tags
| -rwxr-xr-x | t/t9811-git-p4-label-import.sh | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh index 5ac5383fb7..7614dfbd95 100755 --- a/t/t9811-git-p4-label-import.sh +++ b/t/t9811-git-p4-label-import.sh @@ -95,9 +95,8 @@ 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 show-ref --verify refs/tags/TAG_F1_1 && + git show-ref --verify refs/tags/TAG_F1_2 && cd main && @@ -207,8 +206,7 @@ test_expect_success 'use git config to enable import/export of tags' ' git tag CFG_A_GIT_TAG && 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" && |