fix bsd shell negation

peff · gitster · commit bbf08124e0a8 · 2008-05-13T21:44:48.000-07:00
On some shells (notably /bin/sh on FreeBSD 6.1), the
construct

  foo &amp;&amp; ! bar | baz

is true if

  foo &amp;&amp; baz

whereas for most other shells (such as bash) is true if

  foo &amp;&amp; ! baz

We can work around this by specifying

  foo &amp;&amp; ! (bar | baz)

which works everywhere.

Signed-off-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-rebase.sh b/git-rebase.sh
@@ -353,7 +353,7 @@ orig_head=$branch
 mb=$(git merge-base "$onto" "$branch")
 if test "$upstream" = "$onto" && test "$mb" = "$onto" &&
 	# linear history?
-	! git rev-list --parents "$onto".."$branch" | grep " .* " > /dev/null
+	! (git rev-list --parents "$onto".."$branch" | grep " .* ") > /dev/null
 then
 	# Lazily switch to the target branch if needed...
 	test -z "$switch_to" || git checkout "$switch_to"
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
@@ -44,13 +44,13 @@ test_expect_success 'rebase against master' '
 
 test_expect_success \
     'the rebase operation should not have destroyed author information' \
-    '! git log | grep "Author:" | grep "<>"'
+    '! (git log | grep "Author:" | grep "<>")'
 
 test_expect_success 'rebase after merge master' '
      git reset --hard topic &&
      git merge master &&
      git rebase master &&
-     ! git show | grep "^Merge:"
+     ! (git show | grep "^Merge:")
 '
 
 test_expect_success 'rebase of history with merges is linearized' '
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
@@ -81,17 +81,17 @@ test_expect_success '.gitignore test setup' '
 
 test_expect_success '.gitignore is honored' '
 	git add . &&
-	! git ls-files | grep "\\.ig"
+	! (git ls-files | grep "\\.ig")
 '
 
 test_expect_success 'error out when attempting to add ignored ones without -f' '
 	! git add a.?? &&
-	! git ls-files | grep "\\.ig"
+	! (git ls-files | grep "\\.ig")
 '
 
 test_expect_success 'error out when attempting to add ignored ones without -f' '
 	! git add d.?? &&
-	! git ls-files | grep "\\.ig"
+	! (git ls-files | grep "\\.ig")
 '
 
 test_expect_success 'add ignored ones with -f' '
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
@@ -65,7 +65,7 @@ test_expect_success \
 
 have_64bits=
 if msg=$(git verify-pack -v "test-3-${pack3}.pack" 2>&1) ||
-	! echo "$msg" | grep "pack too large .* off_t"
+	! (echo "$msg" | grep "pack too large .* off_t")
 then
 	have_64bits=t
 else
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
@@ -41,7 +41,7 @@ test_expect_success \
 test_expect_success \
 	"using paths with --interactive" \
 	"echo bong-o-bong >file &&
-	! echo 7 | git-commit -m foo --interactive file"
+	! (echo 7 | git-commit -m foo --interactive file)"
 
 test_expect_success \
 	"using invalid commit with -C" \

Original file line number	Diff line number	Diff line change
`@@ -81,17 +81,17 @@ test_expect_success '.gitignore test setup' '`
`81`	`81`
`82`	`82`	`test_expect_success '.gitignore is honored' '`
`83`	`83`	`git add . &&`
`84`		`- ! git ls-files \| grep "\\.ig"`
	`84`	`+ ! (git ls-files \| grep "\\.ig")`
`85`	`85`	`'`
`86`	`86`
`87`	`87`	`test_expect_success 'error out when attempting to add ignored ones without -f' '`
`88`	`88`	`! git add a.?? &&`
`89`		`- ! git ls-files \| grep "\\.ig"`
	`89`	`+ ! (git ls-files \| grep "\\.ig")`
`90`	`90`	`'`
`91`	`91`
`92`	`92`	`test_expect_success 'error out when attempting to add ignored ones without -f' '`
`93`	`93`	`! git add d.?? &&`
`94`		`- ! git ls-files \| grep "\\.ig"`
	`94`	`+ ! (git ls-files \| grep "\\.ig")`
`95`	`95`	`'`
`96`	`96`
`97`	`97`	`test_expect_success 'add ignored ones with -f' '`