Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-30 07:19:30 +0300
committerJunio C Hamano <gitster@pobox.com>2019-09-30 07:19:30 +0300
commitd693345518e9d5145902ec001a364ccdec8e148b (patch)
treeb978cd237fbabe3459ce986ecb2378dafe1259c1 /t/t3005-ls-files-relative.sh
parentd8ce144e11fef0606a531a5a9c34c2a8ca09e155 (diff)
parentbd482d6e3348fe369b3b1db2dadbca278a0f0025 (diff)
Merge branch 'dl/use-sq-from-test-lib'
Code cleanup. * dl/use-sq-from-test-lib: t: use common $SQ variable
Diffstat (limited to 't/t3005-ls-files-relative.sh')
-rwxr-xr-xt/t3005-ls-files-relative.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 583e467683..2ec69a8a26 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -7,8 +7,6 @@ This test runs git ls-files with various relative path arguments.
. ./test-lib.sh
-sq=\'
-
test_expect_success 'prepare' '
: >never-mind-me &&
git add never-mind-me &&
@@ -42,9 +40,9 @@ test_expect_success 'ls-files -c' '
cd top/sub &&
for f in ../y*
do
- echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
+ echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
done >expect.err &&
- echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
+ echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
ls ../x* >expect.out &&
test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&
@@ -57,9 +55,9 @@ test_expect_success 'ls-files -o' '
cd top/sub &&
for f in ../x*
do
- echo "error: pathspec $sq$f$sq did not match any file(s) known to git"
+ echo "error: pathspec $SQ$f$SQ did not match any file(s) known to git"
done >expect.err &&
- echo "Did you forget to ${sq}git add${sq}?" >>expect.err &&
+ echo "Did you forget to ${SQ}git add${SQ}?" >>expect.err &&
ls ../y* >expect.out &&
test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
test_cmp expect.out actual.out &&