summaryrefslogtreecommitdiff
path: root/t/t7006-pager.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t7006-pager.sh')
-rwxr-xr-xt/t7006-pager.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index fc993fc8c4..eb9651da89 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -37,11 +37,11 @@ then
}
test_set_prereq TTY
else
- say no usable terminal, so skipping some tests
+ say "# no usable terminal, so skipping some tests"
fi
test_expect_success 'setup' '
- unset GIT_PAGER GIT_PAGER_IN_USE &&
+ unset GIT_PAGER GIT_PAGER_IN_USE;
test_might_fail git config --unset core.pager &&
PAGER="cat >paginated.out" &&
@@ -110,7 +110,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' '
@@ -165,7 +165,7 @@ then
fi
test_expect_success SIMPLEPAGERTTY 'default pager is used by default' '
- unset PAGER GIT_PAGER &&
+ unset PAGER GIT_PAGER;
test_might_fail git config --unset core.pager &&
rm -f default_pager_used ||
cleanup_fail &&
@@ -184,7 +184,7 @@ test_expect_success SIMPLEPAGERTTY 'default pager is used by default' '
'
test_expect_success TTY 'PAGER overrides default pager' '
- unset GIT_PAGER &&
+ unset GIT_PAGER;
test_might_fail git config --unset core.pager &&
rm -f PAGER_used ||
cleanup_fail &&
@@ -196,7 +196,7 @@ test_expect_success TTY 'PAGER overrides default pager' '
'
test_expect_success TTY 'core.pager overrides PAGER' '
- unset GIT_PAGER &&
+ unset GIT_PAGER;
rm -f core.pager_used ||
cleanup_fail &&