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

Beat Bolli · gitster · commit 67dd07e8af11 · 2024-03-16T11:08:56.000-07:00
Signed-off-by: Beat Bolli &lt;dev+git@drbeat.li&gt;
Acked-by: Taylor Blau &lt;me@ttaylorr.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
 '
 

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ test_expect_success 'branch: --verbose works with messages using CRLF' '`
`97`	`97`	`git branch -v >tmp &&`
`98`	`98`	`# Remove first two columns, and the line for the currently checked out branch`
`99`	`99`	`current=$(git branch --show-current) &&`
`100`		`- grep -v $current <tmp \| awk "{\$1=\$2=\"\"}1" >actual &&`
	`100`	`+ awk "/$current/ { next } { \$1 = \$2 = \"\" } 1" <tmp >actual &&`
`101`	`101`	`test_cmp expect actual`
`102`	`102`	`'`
`103`	`103`