mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00

directory_exists_in_index() takes pathname and its length, but its helper function directory_exists_in_index_icase() reads one byte beyond the end of the pathname and expects there to be a '/'. This needs to be fixed, as that one-byte-beyond-the-end location may not even be readable, possibly by not registering directories to name hashes with trailing slashes. In the meantime, update the new caller added recently to treat_one_path() to make sure that the path buffer it gives the function is one byte longer than the path it is asking the function about by appending a slash to it. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
116 lines
2.4 KiB
Bash
Executable file
116 lines
2.4 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git ls-files -k and -m flags test.
|
|
|
|
This test prepares the following in the cache:
|
|
|
|
path0 - a file
|
|
path1 - a symlink
|
|
path2/file2 - a file in a directory
|
|
path3/file3 - a file in a directory
|
|
pathx/ju - a file in a directory
|
|
|
|
and the following on the filesystem:
|
|
|
|
path0/file0 - a file in a directory
|
|
path1/file1 - a file in a directory
|
|
path2 - a file
|
|
path3 - a symlink
|
|
path4 - a file
|
|
path5 - a symlink
|
|
path6/file6 - a file in a directory
|
|
pathx/ju/nk - a file in a directory to be killed
|
|
|
|
git ls-files -k should report that existing filesystem
|
|
objects except path4, path5 and path6/file6 to be killed.
|
|
|
|
Also for modification test, the cache and working tree have:
|
|
|
|
path7 - an empty file, modified to a non-empty file.
|
|
path8 - a non-empty file, modified to an empty file.
|
|
path9 - an empty file, cache dirtied.
|
|
path10 - a non-empty file, cache dirtied.
|
|
|
|
We should report path0, path1, path2/file2, path3/file3, path7 and path8
|
|
modified without reporting path9 and path10.
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
date >path0
|
|
if test_have_prereq SYMLINKS
|
|
then
|
|
ln -s xyzzy path1
|
|
else
|
|
date > path1
|
|
fi
|
|
mkdir path2 path3 pathx
|
|
date >path2/file2
|
|
date >path3/file3
|
|
>pathx/ju
|
|
: >path7
|
|
date >path8
|
|
: >path9
|
|
date >path10
|
|
test_expect_success \
|
|
'git update-index --add to add various paths.' \
|
|
"git update-index --add -- path0 path1 path?/file? pathx/ju path7 path8 path9 path10"
|
|
|
|
rm -fr path? ;# leave path10 alone
|
|
date >path2
|
|
if test_have_prereq SYMLINKS
|
|
then
|
|
ln -s frotz path3
|
|
ln -s nitfol path5
|
|
else
|
|
date > path3
|
|
date > path5
|
|
fi
|
|
mkdir -p path0 path1 path6 pathx/ju
|
|
date >path0/file0
|
|
date >path1/file1
|
|
date >path6/file6
|
|
date >path7
|
|
: >path8
|
|
: >path9
|
|
touch path10
|
|
>pathx/ju/nk
|
|
|
|
cat >.expected <<EOF
|
|
path0/file0
|
|
path1/file1
|
|
path2
|
|
path3
|
|
pathx/ju/nk
|
|
EOF
|
|
|
|
test_expect_success 'git ls-files -k to show killed files (w/o icase)' '
|
|
git ls-files -k >.output &&
|
|
test_cmp .expected .output
|
|
'
|
|
|
|
test_expect_success 'git ls-files -k to show killed files (w/ icase)' '
|
|
git -c core.ignorecase=true ls-files -k >.output &&
|
|
test_cmp .expected .output
|
|
'
|
|
|
|
test_expect_success \
|
|
'git ls-files -m to show modified files.' \
|
|
'git ls-files -m >.output'
|
|
cat >.expected <<EOF
|
|
path0
|
|
path1
|
|
path2/file2
|
|
path3/file3
|
|
path7
|
|
path8
|
|
pathx/ju
|
|
EOF
|
|
|
|
test_expect_success \
|
|
'validate git ls-files -m output.' \
|
|
'test_cmp .expected .output'
|
|
|
|
test_done
|