diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2021-12-09 00:10:57 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-12-09 13:35:47 -0800 |
| commit | fca965a3bc173a8fb83f34b156c2aa6028803356 (patch) | |
| tree | edba44108739e06002cead23ff210a3c61869bc8 | |
| parent | The first batch to start the current cycle (diff) | |
| download | tgif-fca965a3bc173a8fb83f34b156c2aa6028803356.tar.xz | |
t/lib-pager: use sane_unset() to avoid breaking &&-chain
This test intentionally breaks the &&-chain following `unset` since it
doesn't know if `unset` will succeed or fail and doesn't want a local
`unset` failure to abort the test overall. We can do better by using
sane_unset() which can be linked into the &&-chain as usual.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | t/lib-pager.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-pager.sh b/t/lib-pager.sh index 3aa7a3ffd8..e5eb28df4e 100644 --- a/t/lib-pager.sh +++ b/t/lib-pager.sh @@ -3,7 +3,7 @@ test_expect_success 'determine default pager' ' test_might_fail git config --unset core.pager && less=$( - unset PAGER GIT_PAGER; + sane_unset PAGER GIT_PAGER && git var GIT_PAGER ) && test -n "$less" |