summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2011-08-17 22:00:47 -0700
committerJunio C Hamano <gitster@pobox.com>2011-08-18 14:01:48 -0700
commit212ad944209a928dbf79faa124de77be5c84532e (patch)
tree1e96a5cfdb85b2a51bc6b63fb807ed988c7b7c86
parenta47a645e7057f28441f0f4b259db11171158553a (diff)
downloadgit-212ad944209a928dbf79faa124de77be5c84532e.tar.gz
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 <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t7006-pager.sh4
1 files 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 </dev/null'
test_expect_success TTY 'command-specific pager' '
- unset PAGER GIT_PAGER;
+ sane_unset PAGER GIT_PAGER &&
echo "foo:initial" >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"