mirror of
https://github.com/git/git.git
synced 2024-11-16 14:04:52 +01:00
26c986e118
When the working tree walker encounters a directory, it asks the function treat_directory() if it should descend into it, show it as an untracked directory, or do something else. When the directory is the top of the submodule working tree, we used to say "That is an untracked directory", which was bogus. It is an entity that is tracked in the index of the repository we are looking at, and that is not to be descended into it. Return path_none, not path_untracked, to report that. The existing case that path_untracked is returned for a newly discovered submodule that is not tracked in the index (this only happens when DIR_NO_GITLINKS option is not used) is unchanged, but that is exactly because the submodule is not tracked in the index. Signed-off-by: Junio C Hamano <gitster@pobox.com>
118 lines
2.6 KiB
Bash
Executable file
118 lines
2.6 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
|
|
submod1/ - a submodule
|
|
submod2/ - another submodule
|
|
|
|
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
|
|
submod1/ - a submodule (modified from the cache)
|
|
submod2/ - a submodule (matches the cache)
|
|
|
|
git ls-files -k should report that existing filesystem objects
|
|
path0/*, path1/*, path2 and path3 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. submod1 is also modified.
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'git update-index --add to add various paths.' '
|
|
date >path0 &&
|
|
test_ln_s_add xyzzy path1 &&
|
|
mkdir path2 path3 &&
|
|
date >path2/file2 &&
|
|
date >path3/file3 &&
|
|
: >path7 &&
|
|
date >path8 &&
|
|
: >path9 &&
|
|
date >path10 &&
|
|
git update-index --add -- path0 path?/file? path7 path8 path9 path10 &&
|
|
for i in 1 2
|
|
do
|
|
git init submod$i &&
|
|
(
|
|
cd submod$i && git commit --allow-empty -m "empty $i"
|
|
) || break
|
|
done &&
|
|
git update-index --add submod[12]
|
|
(
|
|
cd submod1 &&
|
|
git commit --allow-empty -m "empty 1 (updated)"
|
|
) &&
|
|
rm -fr path? # leave path10 alone
|
|
'
|
|
|
|
test_expect_success 'git ls-files -k to show killed files.' '
|
|
date >path2 &&
|
|
if test_have_prereq SYMLINKS
|
|
then
|
|
ln -s frotz path3 &&
|
|
ln -s nitfol path5
|
|
else
|
|
date >path3 &&
|
|
date >path5
|
|
fi &&
|
|
mkdir path0 path1 path6 &&
|
|
date >path0/file0 &&
|
|
date >path1/file1 &&
|
|
date >path6/file6 &&
|
|
date >path7 &&
|
|
: >path8 &&
|
|
: >path9 &&
|
|
touch path10 &&
|
|
git ls-files -k >.output
|
|
'
|
|
|
|
test_expect_success 'validate git ls-files -k output.' '
|
|
cat >.expected <<-\EOF &&
|
|
path0/file0
|
|
path1/file1
|
|
path2
|
|
path3
|
|
EOF
|
|
test_cmp .expected .output
|
|
'
|
|
|
|
test_expect_success 'git ls-files -m to show modified files.' '
|
|
git ls-files -m >.output
|
|
'
|
|
|
|
test_expect_success 'validate git ls-files -m output.' '
|
|
cat >.expected <<-\EOF &&
|
|
path0
|
|
path1
|
|
path2/file2
|
|
path3/file3
|
|
path7
|
|
path8
|
|
submod1
|
|
EOF
|
|
test_cmp .expected .output
|
|
'
|
|
|
|
test_done
|