2fb6d6d6dd
Commit ce8e880 converted ls-files to use parseopt; the
--no-empty-directory option was converted as an
OPT_BIT for "empty-directory" to set the
DIR_HIDE_EMPTY_DIRECTORY flag. However, that makes it do the
opposite of what it should: --empty-directory would hide,
but --no-empty-directory would turn off hiding.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
69 lines
1.5 KiB
Bash
Executable File
69 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='git ls-files test (--others should pick up symlinks).
|
|
|
|
This test runs git ls-files --others with the following on the
|
|
filesystem.
|
|
|
|
path0 - a file
|
|
path1 - a symlink
|
|
path2/file2 - a file in a directory
|
|
path3-junk - a file to confuse things
|
|
path3/file3 - a file in a directory
|
|
path4 - an empty directory
|
|
'
|
|
. ./test-lib.sh
|
|
|
|
date >path0
|
|
ln -s xyzzy path1
|
|
mkdir path2 path3 path4
|
|
date >path2/file2
|
|
date >path2-junk
|
|
date >path3/file3
|
|
date >path3-junk
|
|
git update-index --add path3-junk path3/file3
|
|
|
|
cat >expected1 <<EOF
|
|
expected1
|
|
expected2
|
|
expected3
|
|
output
|
|
path0
|
|
path1
|
|
path2-junk
|
|
path2/file2
|
|
EOF
|
|
sed -e 's|path2/file2|path2/|' <expected1 >expected2
|
|
cat <expected2 >expected3
|
|
echo path4/ >>expected2
|
|
|
|
test_expect_success \
|
|
'git ls-files --others to show output.' \
|
|
'git ls-files --others >output'
|
|
|
|
test_expect_success \
|
|
'git ls-files --others should pick up symlinks.' \
|
|
'test_cmp expected1 output'
|
|
|
|
test_expect_success \
|
|
'git ls-files --others --directory to show output.' \
|
|
'git ls-files --others --directory >output'
|
|
|
|
|
|
test_expect_success \
|
|
'git ls-files --others --directory should not get confused.' \
|
|
'test_cmp expected2 output'
|
|
|
|
test_expect_success \
|
|
'git ls-files --others --directory --no-empty-directory to show output.' \
|
|
'git ls-files --others --directory --no-empty-directory >output'
|
|
|
|
test_expect_success \
|
|
'--no-empty-directory hides empty directory' \
|
|
'test_cmp expected3 output'
|
|
|
|
test_done
|