Browse Source

fix bsd shell negation

On some shells (notably /bin/sh on FreeBSD 6.1), the
construct

  foo && ! bar | baz

is true if

  foo && baz

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

  foo && ! baz

We can work around this by specifying

  foo && ! (bar | baz)

which works everywhere.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 17 years ago committed by Junio C Hamano
parent
commit
bbf08124e0
  1. 2
      git-rebase.sh
  2. 4
      t/t3400-rebase.sh
  3. 6
      t/t3700-add.sh
  4. 2
      t/t5302-pack-index.sh
  5. 2
      t/t7501-commit.sh

2
git-rebase.sh

@ -353,7 +353,7 @@ orig_head=$branch @@ -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"

4
t/t3400-rebase.sh

@ -44,13 +44,13 @@ test_expect_success 'rebase against master' ' @@ -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' '

6
t/t3700-add.sh

@ -81,17 +81,17 @@ test_expect_success '.gitignore test setup' ' @@ -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' '

2
t/t5302-pack-index.sh

@ -65,7 +65,7 @@ test_expect_success \ @@ -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

2
t/t7501-commit.sh

@ -41,7 +41,7 @@ test_expect_success \ @@ -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" \

Loading…
Cancel
Save