diff mbox series

[01/19] t/lib-pager: use sane_unset() to avoid breaking &&-chain

Message ID 20211209051115.52629-2-sunshine@sunshineco.com (mailing list archive)
State Accepted
Commit fca965a3bc173a8fb83f34b156c2aa6028803356
Headers show
Series tests: fix broken &&-chains & abort loops on error | expand

Commit Message

Eric Sunshine Dec. 9, 2021, 5:10 a.m. UTC 
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>
---
 t/lib-pager.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

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"