aboutsummaryrefslogtreecommitdiff
path: root/t/t7006-pager.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-22 09:35:36 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-22 09:35:36 -0700
commit262657dce61b417d712a7f4cd85ff8ff4c6ec3a4 (patch)
tree1074778dccb10ef6cfe3a63d2a0d6b21dded3d34 /t/t7006-pager.sh
parent6df2ffaeef3f593214e88d9c148a7f3504f13e5e (diff)
parenta4c24549acf16f7917ea3ddd811c6c61afc5689c (diff)
downloadgit-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.tar.gz
git-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.tar.xz
Merge branch 'maint'
* maint: Update draft release notes to 1.7.1.1 tests: remove unnecessary '^' from 'expr' regular expression Conflicts: diff.c
Diffstat (limited to 't/t7006-pager.sh')
-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 a6f367773..9a83241c9 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -109,7 +109,7 @@ test_expect_success TTY 'no pager with --no-pager' '
# for the first color; the text "commit" comes later.
colorful() {
read firstline <$1
- ! expr "$firstline" : "^[a-zA-Z]" >/dev/null
+ ! expr "$firstline" : "[a-zA-Z]" >/dev/null
}
test_expect_success 'tests can detect color' '
@@ -167,7 +167,7 @@ test_expect_success 'determine default pager' '
test -n "$less"
'
-if expr "$less" : '^[a-z][a-z]*$' >/dev/null && test_have_prereq TTY
+if expr "$less" : '[a-z][a-z]*$' >/dev/null && test_have_prereq TTY
then
test_set_prereq SIMPLEPAGER
fi