Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
t7006: modernize calls to unset
author
Jeff King
<peff@peff.net>
Thu, 18 Aug 2011 05:00:47 +0000
(22:00 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 18 Aug 2011 21:01:48 +0000
(14:01 -0700)
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>
t/t7006-pager.sh
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
a47a645
)
diff --git
a/t/t7006-pager.sh
b/t/t7006-pager.sh
index ed7575d0fdf9eebf65d808fa810ab4cc03095025..c0a3135c73f3e8800217d8f1c21786393c71415b 100755
(executable)
--- 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"