mirror of
https://github.com/git/git.git
synced 2024-05-13 05:16:09 +02:00
0f64bfa956
The following sequence of commands reveals an issue with error
reporting of relative paths:
$ mkdir sub
$ cd sub
$ git ls-files --error-unmatch ../bbbbb
error: pathspec 'b' did not match any file(s) known to git.
$ git commit --error-unmatch ../bbbbb
error: pathspec 'b' did not match any file(s) known to git.
This bug is visible only if the normalized path (i.e., the relative
path from the repository root) is longer than the prefix.
Otherwise, the code skips over the normalized path and reads from
an unused memory location which still contains a leftover of the
original command line argument.
So instead, use the existing facilities to deal with relative paths
correctly.
Also fix inconsistency between "checkout" and "commit", e.g.
$ cd Documentation
$ git checkout nosuch.txt
error: pathspec 'Documentation/nosuch.txt' did not match...
$ git commit nosuch.txt
error: pathspec 'nosuch.txt' did not match...
by propagating the prefix down the codepath that reports the error.
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
71 lines
1.3 KiB
Bash
Executable File
71 lines
1.3 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
|
|
|
|
new_line='
|
|
'
|
|
sq=\'
|
|
|
|
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 &&
|
|
echo "Did you forget to ${sq}git add${sq}?" >>expect &&
|
|
ls ../x* >>expect &&
|
|
test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual 2>&1 &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
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 &&
|
|
echo "Did you forget to ${sq}git add${sq}?" >>expect &&
|
|
ls ../y* >>expect &&
|
|
test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual 2>&1 &&
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_done
|