From: Junio C Hamano Date: Fri, 18 Apr 2025 17:54:59 +0000 (-0700) Subject: t9811: fix misconversion of tests X-Git-Tag: v2.50.0-rc0~84^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ee40e26e6999349b09e260c3bc8ab1f5397d8b1b;p=thirdparty%2Fgit.git 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 --- 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" &&