mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Elijah Newren](/assets/img/avatar_default.png)
Nonbare repositories are special directories. Unlike normal directories that we might recurse into to list the files they contain, nonbare repositories must themselves match and then we always report only on the nonbare repository directory itself and not on any of its contents. Separately, when traversing directories to try to find untracked or excluded files, we often think in terms of paths either matching the specified pathspec, or not matching them. However, there is a special value that do_match_pathspec() uses named MATCHED_RECURSIVELY_LEADING_PATHSPEC which means "this directory does not match any pathspec BUT it is possible a file or directory underneath it does." That special value prevents us from prematurely thinking that some directory and everything under it is irrelevant, but also allows us to differentiate from "this is a match". The combination of these two special cases was previously uncovered. Add a test to the testsuite to cover it, and make sure that we return a nonbare repository as a non-match if the best match it got was MATCHED_RECURSIVELY_LEADING_PATHSPEC. Reported-by: christian w <usebees@gmail.com> Simplified-testcase-and-bisection-by: Kyle Meyer <kyle@kyleam.com> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
232 lines
4.6 KiB
Bash
Executable file
232 lines
4.6 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2005 Junio C Hamano
|
|
#
|
|
|
|
test_description='basic tests for ls-files --others
|
|
|
|
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
|
|
|
|
test_expect_success 'setup ' '
|
|
date >path0 &&
|
|
if test_have_prereq SYMLINKS
|
|
then
|
|
ln -s xyzzy path1
|
|
else
|
|
date >path1
|
|
fi &&
|
|
mkdir path2 path3 path4 &&
|
|
date >path2/file2 &&
|
|
date >path2-junk &&
|
|
date >path3/file3 &&
|
|
date >path3-junk &&
|
|
git update-index --add path3-junk path3/file3
|
|
'
|
|
|
|
test_expect_success 'setup: expected output' '
|
|
cat >expected1 <<-\EOF &&
|
|
expected1
|
|
expected2
|
|
expected3
|
|
output
|
|
path0
|
|
path1
|
|
path2-junk
|
|
path2/file2
|
|
EOF
|
|
|
|
sed -e "s|path2/file2|path2/|" <expected1 >expected2 &&
|
|
cp expected2 expected3 &&
|
|
echo path4/ >>expected2
|
|
'
|
|
|
|
test_expect_success 'ls-files --others' '
|
|
git ls-files --others >output &&
|
|
test_cmp expected1 output
|
|
'
|
|
|
|
test_expect_success 'ls-files --others --directory' '
|
|
git ls-files --others --directory >output &&
|
|
test_cmp expected2 output
|
|
'
|
|
|
|
test_expect_success '--no-empty-directory hides empty directory' '
|
|
git ls-files --others --directory --no-empty-directory >output &&
|
|
test_cmp expected3 output
|
|
'
|
|
|
|
test_expect_success 'ls-files --others handles non-submodule .git' '
|
|
mkdir not-a-submodule &&
|
|
echo foo >not-a-submodule/.git &&
|
|
git ls-files -o >output &&
|
|
test_cmp expected1 output
|
|
'
|
|
|
|
test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' '
|
|
git init super &&
|
|
git init sub &&
|
|
(
|
|
cd sub &&
|
|
>a &&
|
|
git add a &&
|
|
git commit -m sub &&
|
|
git pack-refs --all
|
|
) &&
|
|
(
|
|
cd super &&
|
|
"$SHELL_PATH" "$TEST_DIRECTORY/../contrib/workdir/git-new-workdir" ../sub sub &&
|
|
git ls-files --others --exclude-standard >../actual
|
|
) &&
|
|
echo sub/ >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'setup nested pathspec search' '
|
|
test_create_repo nested &&
|
|
(
|
|
cd nested &&
|
|
|
|
mkdir -p partially_tracked/untracked_dir &&
|
|
> partially_tracked/content &&
|
|
> partially_tracked/untracked_dir/file &&
|
|
|
|
mkdir -p untracked/deep &&
|
|
> untracked/deep/path &&
|
|
> untracked/deep/foo.c &&
|
|
|
|
git add partially_tracked/content
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files -o --directory with single deep dir pathspec' '
|
|
(
|
|
cd nested &&
|
|
|
|
git ls-files -o --directory untracked/deep/ >actual &&
|
|
|
|
cat <<-EOF >expect &&
|
|
untracked/deep/
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files -o --directory with multiple dir pathspecs' '
|
|
(
|
|
cd nested &&
|
|
|
|
git ls-files -o --directory partially_tracked/ untracked/ >actual &&
|
|
|
|
cat <<-EOF >expect &&
|
|
partially_tracked/untracked_dir/
|
|
untracked/
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files -o --directory with mix dir/file pathspecs' '
|
|
(
|
|
cd nested &&
|
|
|
|
git ls-files -o --directory partially_tracked/ untracked/deep/path >actual &&
|
|
|
|
cat <<-EOF >expect &&
|
|
partially_tracked/untracked_dir/
|
|
untracked/deep/path
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files -o --directory with glob filetype match' '
|
|
(
|
|
cd nested &&
|
|
|
|
# globs kinda defeat --directory, but only for that pathspec
|
|
git ls-files --others --directory partially_tracked "untracked/*.c" >actual &&
|
|
|
|
cat <<-EOF >expect &&
|
|
partially_tracked/untracked_dir/
|
|
untracked/deep/foo.c
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files -o --directory with mix of tracked states' '
|
|
(
|
|
cd nested &&
|
|
|
|
# globs kinda defeat --directory, but only for that pathspec
|
|
git ls-files --others --directory partially_tracked/ "untracked/?*" >actual &&
|
|
|
|
cat <<-EOF >expect &&
|
|
partially_tracked/untracked_dir/
|
|
untracked/deep/
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files -o --directory with glob filetype match only' '
|
|
(
|
|
cd nested &&
|
|
|
|
git ls-files --others --directory "untracked/*.c" >actual &&
|
|
|
|
cat <<-EOF >expect &&
|
|
untracked/deep/foo.c
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files -o --directory to get immediate paths under one dir only' '
|
|
(
|
|
cd nested &&
|
|
|
|
git ls-files --others --directory "untracked/?*" >actual &&
|
|
|
|
cat <<-EOF >expect &&
|
|
untracked/deep/
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'ls-files -o avoids listing untracked non-matching gitdir' '
|
|
test_when_finished "rm -rf nested/untracked/deep/empty" &&
|
|
(
|
|
cd nested &&
|
|
|
|
git init untracked/deep/empty &&
|
|
git ls-files --others "untracked/*.c" >actual &&
|
|
|
|
cat <<-EOF >expect &&
|
|
untracked/deep/foo.c
|
|
EOF
|
|
|
|
test_cmp expect actual
|
|
)
|
|
'
|
|
|
|
test_done
|