diff options
| author | Jeff King <peff@peff.net> | 2008-05-14 00:01:22 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-13 21:44:48 -0700 |
| commit | bbf08124e0a87658a76b53a05d67227fa3b4e7b9 (patch) | |
| tree | e3eb0c8faee5837f0f0eefb8f831c068f67a2705 /t/t3400-rebase.sh | |
| parent | 64c0d71ce91696dfe5beb4b51e3233e56c857290 (diff) | |
| download | git-bbf08124e0a87658a76b53a05d67227fa3b4e7b9.tar.gz | |
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>
Diffstat (limited to 't/t3400-rebase.sh')
| -rwxr-xr-x | t/t3400-rebase.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 496f4ec172..fdad7dad61 100755 --- 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' ' |