[v2,11/22] t/t6*: avoid redundant uses of cat

Message ID	20240315194620.10713-12-dev+git@drbeat.li (mailing list archive)
State	Accepted
Commit	edfa63e7f48864103d5dfc307186c1217db73e42
Headers	show Received: from mail-gateway-shared03.cyon.net (mail-gateway-shared03.cyon.net [194.126.200.53]) (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 8287655784 for <git@vger.kernel.org>; Fri, 15 Mar 2024 19:46:46 +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 v2 11/22] t/t6*: avoid redundant uses of cat Date: Fri, 15 Mar 2024 20:46:08 +0100 Message-ID: <20240315194620.10713-12-dev+git@drbeat.li> In-Reply-To: <20240315194620.10713-1-dev+git@drbeat.li> References: <20240305212533.12947-1-dev+git@drbeat.li> <20240315194620.10713-1-dev+git@drbeat.li> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	avoid redundant pipelines \| expand [v2,00/22] avoid redundant pipelines [v2,01/22] doc: avoid redundant use of cat [v2,02/22] contrib/subtree/t: avoid redundant use of cat [v2,03/22] t/lib-cvs.sh: avoid redundant use of cat [v2,04/22] t/annotate-tests.sh: avoid redundant use of cat [v2,05/22] t/perf: avoid redundant use of cat [v2,06/22] t/t0: avoid redundant uses of cat [v2,07/22] t/t1: avoid redundant uses of cat [v2,08/22] t/t3: avoid redundant uses of cat [v2,09/22] t/t4: avoid redundant uses of cat [v2,10/22] t/t5: avoid redundant uses of cat [v2,11/22] t/t6: avoid redundant uses of cat [v2,12/22] t/t7: avoid redundant use of cat [v2,13/22] t/t8: avoid redundant use of cat [v2,14/22] t/t9: avoid redundant uses of cat [v2,15/22] t/t1: merge a "grep \| sed" pipeline [v2,16/22] t/t3: merge a "grep \| awk" pipeline [v2,17/22] t/t4: merge a "grep \| sed" pipeline [v2,18/22] t/t5: merge a "grep \| sed" pipeline [v2,19/22] t/t8: merge "grep \| sed" pipelines [v2,20/22] t/t9*: merge "grep \| sed" pipelines [v2,21/22] contrib/coverage-diff: avoid redundant pipelines [v2,22/22] git-quiltimport: avoid an unnecessary subshell

Message ID

20240315194620.10713-12-dev+git@drbeat.li (mailing list archive)

State

Accepted

Commit

edfa63e7f48864103d5dfc307186c1217db73e42

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 v2 11/22] t/t6*: avoid redundant uses of cat
Date: Fri, 15 Mar 2024 20:46:08 +0100
Message-ID: <20240315194620.10713-12-dev+git@drbeat.li>
In-Reply-To: <20240315194620.10713-1-dev+git@drbeat.li>
References: <20240305212533.12947-1-dev+git@drbeat.li>
 <20240315194620.10713-1-dev+git@drbeat.li>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

avoid redundant pipelines | expand

Commit Message

Beat Bolli March 15, 2024, 7:46 p.m. UTC

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
---
 t/t6112-rev-list-filters-objects.sh | 2 +-
 t/t6413-merge-crlf.sh               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index 52822b9461a1..43e1afd44c9b 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -670,7 +670,7 @@  test_expect_success 'rev-list W/ --missing=print' '
 	awk -f print_2.awk ls_files_result |
 	sort >expected &&
 
-	for id in `cat expected | sed "s|..|&/|"`
+	for id in `sed "s|..|&/|" expected`
 	do
 		rm r1/.git/objects/$id || return 1
 	done &&
diff --git a/t/t6413-merge-crlf.sh b/t/t6413-merge-crlf.sh
index b4f4a313f486..647ea1e83829 100755
--- a/t/t6413-merge-crlf.sh
+++ b/t/t6413-merge-crlf.sh
@@ -34,14 +34,14 @@  test_expect_success setup '
 test_expect_success 'Check "ours" is CRLF' '
 	git reset --hard initial &&
 	git merge side -s ours &&
-	cat file | remove_cr | append_cr >file.temp &&
+	remove_cr <file | append_cr >file.temp &&
 	test_cmp file file.temp
 '
 
 test_expect_success 'Check that conflict file is CRLF' '
 	git reset --hard a &&
 	test_must_fail git merge side &&
-	cat file | remove_cr | append_cr >file.temp &&
+	remove_cr <file | append_cr >file.temp &&
 	test_cmp file file.temp
 '

[v2,11/22] t/t6*: avoid redundant uses of cat

Commit Message

Patch