From: Beat Bolli <bb@drbeat.li>
Date: Fri, 15 Mar 2024 19:46:13 +0000 (+0100)
Subject: t/t3*: merge a "grep | awk" pipeline
X-Git-Tag: v2.45.0-rc0~80^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67dd07e8af11534d8bd723747f9c0a91c530b6bc;p=thirdparty%2Fgit.git

t/t3*: merge a "grep | awk" pipeline

Signed-off-by: Beat Bolli <dev+git@drbeat.li>
Acked-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh
index 5eed640a68..50ae222f08 100755
--- a/t/t3920-crlf-messages.sh
+++ b/t/t3920-crlf-messages.sh
@@ -97,7 +97,7 @@ test_expect_success 'branch: --verbose works with messages using CRLF' '
 	git branch -v >tmp &&
 	# Remove first two columns, and the line for the currently checked out branch
 	current=$(git branch --show-current) &&
-	grep -v $current <tmp | awk "{\$1=\$2=\"\"}1"  >actual &&
+	awk "/$current/ { next } { \$1 = \$2 = \"\" } 1" <tmp >actual &&
 	test_cmp expect actual
 '