Subject: Re: [GSoC] [PATCH v7 1/1] t9811: be more precise to check importing of tags

From: Junio C Hamano <[email-masked]>
Date: Fri, 18 Apr 2025 14:03:41 -0700

Junio C Hamano <[email-masked]> writes:

> Let's add this on top.

Well, it turns out that it wasn't enough.

--- >8 ------ >8 ------ >8 ---
Subject: [PATCH] t9811: fix misconversion of test

The previous commit started to insist TAG_F1_ONLY to be missing,
which was not in the original.  Let's not to be overly eager in the
conversion.

Aso, the other hunk in the commit introduced shell syntax errors,
breaking the test to fail.  Fix it.

Signed-off-by: Junio C Hamano <[email-masked]>
---
 t/t9811-git-p4-label-import.sh | 3 +--
 1 file changed, 1 insertion(+), 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" &&
-- 
2.49.0-524-g64a58d64d1