[18/22] t/t5*: merge a "grep | sed" pipeline

Message ID	20240305212533.12947-19-dev+git@drbeat.li (mailing list archive)
State	Superseded
Headers	show Received: from mail-gateway-shared15.cyon.net (mail-gateway-shared15.cyon.net [194.126.200.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A82EB12E1E8 for <git@vger.kernel.org>; Tue, 5 Mar 2024 21:26:48 +0000 (UTC) From: "Beat Bolli" <bb@drbeat.li> To: git@vger.kernel.org Cc: Junio C Hamano <gitster@pobox.com>, Beat Bolli <dev+git@drbeat.li> Subject: [PATCH 18/22] t/t5*: merge a "grep \| sed" pipeline Date: Tue, 5 Mar 2024 22:25:17 +0100 Message-ID: <20240305212533.12947-19-dev+git@drbeat.li> In-Reply-To: <20240305212533.12947-1-dev+git@drbeat.li> References: <20240305212533.12947-1-dev+git@drbeat.li> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	avoid redundant pipelines \| expand [00/22] avoid redundant pipelines [01/22] doc: avoid redundant use of cat [02/22] contrib/subtree/t: avoid redundant use of cat [03/22] t/lib-cvs.sh: avoid redundant use of cat [04/22] t/annotate-tests.sh: avoid redundant use of cat [05/22] t/perf: avoid redundant use of cat [06/22] t/t0: avoid redundant uses of cat [07/22] t/t1: avoid redundant uses of cat [08/22] t/t3: avoid redundant uses of cat [09/22] t/t4: avoid redundant uses of cat [10/22] t/t5: avoid redundant uses of cat [11/22] t/t6: avoid redundant uses of cat [12/22] t/t7: avoid redundant use of cat [13/22] t/t8: avoid redundant use of cat [14/22] t/t9: avoid redundant uses of cat [15/22] t/t1: merge a "grep \| sed" pipeline [16/22] t/t3: merge a "grep \| awk" pipeline [17/22] t/t4: merge a "grep \| sed" pipeline [18/22] t/t5: merge a "grep \| sed" pipeline [19/22] t/t8: merge "grep \| sed" pipelines [20/22] t/t9*: merge "grep \| sed" pipelines [21/22] contrib/coverage-diff: avoid redundant pipelines [22/22] git-quiltimport: avoid an unnecessary subshell

Message ID

20240305212533.12947-19-dev+git@drbeat.li (mailing list archive)

State

Superseded

Headers

From: "Beat Bolli" <bb@drbeat.li>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
	Beat Bolli <dev+git@drbeat.li>
Subject: [PATCH 18/22] t/t5*: merge a "grep | sed" pipeline
Date: Tue,  5 Mar 2024 22:25:17 +0100
Message-ID: <20240305212533.12947-19-dev+git@drbeat.li>
In-Reply-To: <20240305212533.12947-1-dev+git@drbeat.li>
References: <20240305212533.12947-1-dev+git@drbeat.li>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

avoid redundant pipelines | expand

Comments

Junio C Hamano March 6, 2024, 12:57 a.m. UTC | #1

"Beat Bolli" <bb@drbeat.li> writes:

> Signed-off-by: Beat Bolli <dev+git@drbeat.li>
> ---
>  t/t5401-update-hooks.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
> index 8b8bc47dc0b9..d8cadeec7331 100755
> --- a/t/t5401-update-hooks.sh
> +++ b/t/t5401-update-hooks.sh
> @@ -123,7 +123,7 @@ remote: STDOUT post-update
>  remote: STDERR post-update
>  EOF
>  test_expect_success 'send-pack stderr contains hook messages' '
> -	grep ^remote: send.err | sed "s/ *\$//" >actual &&
> +	sed -n "/^remote:/s/ *\$//p" send.err >actual &&
>  	test_cmp expect actual
>  '

Both 17 & 18 look good.

diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index 8b8bc47dc0b9..d8cadeec7331 100755
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -123,7 +123,7 @@  remote: STDOUT post-update
 remote: STDERR post-update
 EOF
 test_expect_success 'send-pack stderr contains hook messages' '
-	grep ^remote: send.err | sed "s/ *\$//" >actual &&
+	sed -n "/^remote:/s/ *\$//p" send.err >actual &&
 	test_cmp expect actual
 '

[18/22] t/t5*: merge a "grep | sed" pipeline

Commit Message

Comments

Patch