Skip to content

Commit

Permalink
t7006: modernize calls to unset
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Aug 18, 2011
1 parent a47a645 commit 212ad94
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions t/t7006-pager.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 &&
Expand All @@ -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"
Expand Down

0 comments on commit 212ad94

Please sign in to comment.