1108cea7f8
As a follow-up to d162b25f95 (tests: remove support for
GIT_TEST_GETTEXT_POISON, 2021-01-20) remove most uses of test_i18ncmp
via a simple s/test_i18ncmp/test_cmp/g search-replacement.
I'm leaving t6300-for-each-ref.sh out due to a conflict with in-flight
changes between "master" and "seen", as well as the prerequisite
itself due to other changes between "master" and "next/seen" which add
new test_i18ncmp uses.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
69 lines
1.4 KiB
Bash
Executable File
69 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='ls-files tests with relative paths
|
|
|
|
This test runs git ls-files with various relative path arguments.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'prepare' '
|
|
: >never-mind-me &&
|
|
git add never-mind-me &&
|
|
mkdir top &&
|
|
(
|
|
cd top &&
|
|
mkdir sub &&
|
|
x="x xa xbc xdef xghij xklmno" &&
|
|
y=$(echo "$x" | tr x y) &&
|
|
touch $x &&
|
|
touch $y &&
|
|
cd sub &&
|
|
git add ../x*
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files with mixed levels' '
|
|
(
|
|
cd top/sub &&
|
|
cat >expect <<-EOF &&
|
|
../../never-mind-me
|
|
../x
|
|
EOF
|
|
git ls-files $(cat expect) >actual &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
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"
|
|
done >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 &&
|
|
test_cmp expect.err actual.err
|
|
)
|
|
'
|
|
|
|
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"
|
|
done >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 &&
|
|
test_cmp expect.err actual.err
|
|
)
|
|
'
|
|
|
|
test_done
|