mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
889c6f0e4d
There are many instances where the treatment of symbolic links in the object model and the algorithms are tested, but where it is not necessary to actually have a symbolic link in the worktree. Make adjustments to the tests and remove the SYMLINKS prerequisite when appropriate in trivial cases, where "trivial" means: - merely a replacement of 'ln -s a b && git add b' by test_ln_s_add is needed; - a test for symbolic link on the file system can be split off (and remains protected by SYMLINKS); - existing code is equivalent to test_ln_s_add. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
102 lines
2.2 KiB
Bash
Executable file
102 lines
2.2 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
|
|
|
|
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
|
|
|
|
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
|
|
|
|
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 &&
|
|
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
|
|
EOF
|
|
test_cmp .expected .output
|
|
'
|
|
|
|
test_done
|