tests: shell negation portability fix

peff · gitster · commit 72130808173d · 2008-10-17T11:30:54.000-07:00
Commit 969c8775 introduced a test which uses the non-portable construct: command1 && ! command2 | command3 which must be command1 && ! (command2 | command3) to work on bsd shells (this is another example of bbf0812, which fixed several similar cases). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/t/t4128-apply-root.sh b/t/t4128-apply-root.sh
@@ -72,7 +72,7 @@ test_expect_success 'apply --directory (delete file)' '
 	echo content >some/sub/dir/delfile &&
 	git add some/sub/dir/delfile &&
 	git apply --directory=some/sub/dir/ --index patch &&
-	! git ls-files | grep delfile
+	! (git ls-files | grep delfile)
 '
 
 cat > patch << 'EOF'

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ test_expect_success 'apply --directory (delete file)' '`
`72`	`72`	`echo content >some/sub/dir/delfile &&`
`73`	`73`	`git add some/sub/dir/delfile &&`
`74`	`74`	`git apply --directory=some/sub/dir/ --index patch &&`
`75`		`- ! git ls-files \| grep delfile`
	`75`	`+ ! (git ls-files \| grep delfile)`
`76`	`76`	`'`
`77`	`77`
`78`	`78`	`cat > patch << 'EOF'`