diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 16:35:36 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 16:35:36 (GMT) |
| commit | 262657dce61b417d712a7f4cd85ff8ff4c6ec3a4 (patch) | |
| tree | 1074778dccb10ef6cfe3a63d2a0d6b21dded3d34 /t/t7006-pager.sh | |
| parent | 6df2ffaeef3f593214e88d9c148a7f3504f13e5e (diff) | |
| parent | a4c24549acf16f7917ea3ddd811c6c61afc5689c (diff) | |
| download | git-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.zip git-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.tar.gz git-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.tar.bz2 | |
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-x | t/t7006-pager.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index a6f3677..9a83241 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 |