From 212ad944209a928dbf79faa124de77be5c84532e Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 17 Aug 2011 22:00:47 -0700 Subject: [PATCH] t7006: modernize calls to unset These tests break &&-chaining to deal with broken "unset" implementations. Instead, they should just use sane_unset. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t7006-pager.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index ed7575d0fd..c0a3135c73 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -402,7 +402,7 @@ test_core_pager_subdir expect_success test_must_fail \ 'git -p apply expect && >actual && git config --unset core.pager && @@ -412,7 +412,7 @@ test_expect_success TTY 'command-specific pager' ' ' test_expect_success TTY 'command-specific pager overrides core.pager' ' - unset PAGER GIT_PAGER; + sane_unset PAGER GIT_PAGER && echo "foo:initial" >expect && >actual && git config core.pager "exit 1" -- 2.11.4.GIT