From: Eric Sunshine <sunshine@sunshineco.com>
Date: Thu, 9 Dec 2021 05:10:57 +0000 (-0500)
Subject: t/lib-pager: use sane_unset() to avoid breaking &&-chain
X-Git-Tag: v2.35.0-rc0~46^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fca965a3bc173a8fb83f34b156c2aa6028803356;p=thirdparty%2Fgit.git

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>
---

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"