diff options
| author | Elijah Newren <newren@gmail.com> | 2010-10-03 20:00:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-10-06 20:26:33 (GMT) |
| commit | 00648ba0505bbe1999bb6ae2f1d02a0ef923b191 (patch) | |
| tree | a6bd5229da9fd44b8f29be12cb900d3ef8500868 /t/t7006-pager.sh | |
| parent | bc0f35ca238ff88829cd9839641a316e859348a2 (diff) | |
| download | git-00648ba0505bbe1999bb6ae2f1d02a0ef923b191.zip git-00648ba0505bbe1999bb6ae2f1d02a0ef923b191.tar.gz git-00648ba0505bbe1999bb6ae2f1d02a0ef923b191.tar.bz2 | |
Introduce sane_unset and use it to ensure proper && chaining
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7006-pager.sh')
| -rwxr-xr-x | 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 fb744e3..7d00d49 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -41,7 +41,7 @@ else fi test_expect_success 'setup' ' - unset GIT_PAGER GIT_PAGER_IN_USE; + sane_unset GIT_PAGER GIT_PAGER_IN_USE && test_might_fail git config --unset core.pager && PAGER="cat >paginated.out" && @@ -254,7 +254,7 @@ test_default_pager() { parse_args "$@" $test_expectation SIMPLEPAGERTTY "$cmd - default pager is used by default" " - unset PAGER GIT_PAGER; + sane_unset PAGER GIT_PAGER && test_might_fail git config --unset core.pager && rm -f default_pager_used || cleanup_fail && @@ -277,7 +277,7 @@ test_PAGER_overrides() { parse_args "$@" $test_expectation TTY "$cmd - PAGER overrides default pager" " - unset GIT_PAGER; + sane_unset GIT_PAGER && test_might_fail git config --unset core.pager && rm -f PAGER_used || cleanup_fail && @@ -305,7 +305,7 @@ test_core_pager() { parse_args "$@" $test_expectation TTY "$cmd - repository-local core.pager setting $used_if_wanted" " - unset GIT_PAGER; + sane_unset GIT_PAGER && rm -f core.pager_used || cleanup_fail && @@ -333,7 +333,7 @@ test_pager_subdir_helper() { parse_args "$@" $test_expectation TTY "$cmd - core.pager $used_if_wanted from subdirectory" " - unset GIT_PAGER; + sane_unset GIT_PAGER && rm -f core.pager_used && rm -fr sub || cleanup_fail && |