diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-04-18 10:54:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-18 14:49:14 -0700 |
| commit | ee40e26e6999349b09e260c3bc8ab1f5397d8b1b (patch) | |
| tree | 0a07729aca9ff005a7727cf5eaa9396736f2258a | |
| parent | t9811: be more precise to check importing of tags (diff) | |
| download | git-ee40e26e6999349b09e260c3bc8ab1f5397d8b1b.tar.gz git-ee40e26e6999349b09e260c3bc8ab1f5397d8b1b.zip | |
t9811: fix misconversion of tests
The previous commit started to insist TAG_F1_ONLY to be missing,
which was not in the original. Let's not be overly eager in the
conversion.
Also, the other hunk in the commit introduced a shell syntax error,
causing the test to fail. Fix it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t9811-git-p4-label-import.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh index 39856629c0..7614dfbd95 100755 --- a/t/t9811-git-p4-label-import.sh +++ b/t/t9811-git-p4-label-import.sh @@ -97,7 +97,6 @@ test_expect_success 'two labels on the same changelist' ' 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 && @@ -207,7 +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 show-ref --verify refs/tags/TAG_F1_1 && + git show-ref --verify refs/tags/TAG_F1_1 ) && ( cd "$cli" && |