From: Jeff King <peff@peff.net>
Date: Mon, 13 Oct 2008 09:35:59 +0000 (-0400)
Subject: tests: shell negation portability fix
X-Git-Tag: v1.6.1-rc1~149
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=80bfd76af7ac817d4a4b9b7d54485076897c9a67;p=git.git

tests: shell negation portability fix

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 bbf08124, 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
index bc7a8a868..8f6aea48d 100755
--- 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'