summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-22 09:35:36 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-22 09:35:36 -0700
commit262657dce61b417d712a7f4cd85ff8ff4c6ec3a4 (patch)
tree1074778dccb10ef6cfe3a63d2a0d6b21dded3d34 /t
parentMerge branch 'js/maint-receive-pack-symref-alias' (diff)
parentUpdate draft release notes to 1.7.1.1 (diff)
downloadtgif-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')
-rwxr-xr-xt/t7005-editor.sh2
-rwxr-xr-xt/t7006-pager.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 25b6d2e67c..fe60d699a3 100755
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -13,7 +13,7 @@ test_expect_success 'determine default editor' '
'
-if ! expr "$vi" : '^[a-z]*$' >/dev/null
+if ! expr "$vi" : '[a-z]*$' >/dev/null
then
vi=
fi
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index a6f3677731..9a83241c94 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