[PATCH 4/5 v2] t/t7006: ignore return status of shell's unset builtin
- From
Brandon Casey <casey@nrlssc.navy.mil>
- Date
- Jun 2, 2010, 15:32 UTC
- Message-ID
- <6S2YIhGhiwzh6wTfvWh1Sm_3KoUNJkiAzJKJKLNpqo3MC4Z5besrsZ4fL9wiH35DJsX4cyCs7SM@cipher.nrlssc.navy.mil>
- In-Reply-To
- <CdJJyxR1_KnpwZGt1HSeDymxbS1diQ_jjDxyygUO3WI@cipher.nrlssc.navy.mil>
From: Brandon Casey <drafnel@gmail.com>
The unset builtin of Solaris's xpg4/sh returns non-zero if it is passed a variable name which was not previously set. Since the unset is not likely to fail, ignore its return status, but add a semicolon as a clue that the '&&' was deliberately left off.
Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> --- t/t7006-pager.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 3bc7a2a..a6f3677 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -40,7 +40,7 @@ else fi test_expect_success 'setup' ' - unset GIT_PAGER GIT_PAGER_IN_USE && + unset GIT_PAGER GIT_PAGER_IN_USE; test_might_fail git config --unset core.pager && PAGER="cat >paginated.out" && @@ -159,7 +159,7 @@ test_expect_success 'color when writing to a file intended for a pager' ' ' test_expect_success 'determine default pager' ' - unset PAGER GIT_PAGER && + unset PAGER GIT_PAGER; test_might_fail git config --unset core.pager || cleanup_fail && @@ -173,7 +173,7 @@ then fi test_expect_success SIMPLEPAGER 'default pager is used by default' ' - unset PAGER GIT_PAGER && + unset PAGER GIT_PAGER; test_might_fail git config --unset core.pager && rm -f default_pager_used || cleanup_fail && @@ -192,7 +192,7 @@ test_expect_success SIMPLEPAGER 'default pager is used by default' ' ' test_expect_success TTY 'PAGER overrides default pager' ' - unset GIT_PAGER && + unset GIT_PAGER; test_might_fail git config --unset core.pager && rm -f PAGER_used || cleanup_fail && @@ -204,7 +204,7 @@ test_expect_success TTY 'PAGER overrides default pager' ' ' test_expect_success TTY 'core.pager overrides PAGER' ' - unset GIT_PAGER && + unset GIT_PAGER; rm -f core.pager_used || cleanup_fail &&
-- 1.6.6.2