t3001, t7300: add testcase showcasing missed directory traversal

In the last commit, we added a testcase showing that the directory
traversal machinery sometimes traverses into directories unnecessarily.
Here we show that there are cases where it does the opposite: it does
not traverse into directories, despite those directories having
important files that need to be flagged.

Add a testcase showing that `git ls-files -o -i --directory` can omit
some of the files it should be listing, and another showing that `git
clean -fX` can fail to clean out some of the expected files.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 1ec7cb57c7a81ff9258143e7c8d4a81dc96ff8dc..ac05d1a1793190dbd9a86a3db0994cebff09098c 100755 (executable)
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -292,6 +292,11 @@ EOF
        test_cmp expect actual
 '
 
+test_expect_failure 'ls-files with "**" patterns and --directory' '
+       # Expectation same as previous test
+       git ls-files --directory -o -i --exclude "**/a.1" >actual &&
+       test_cmp expect actual
+'
 
 test_expect_success 'ls-files with "**" patterns and no slashes' '
        git ls-files -o -i --exclude "one**a.1" >actual &&

diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 07e8ba2d4b8558b6e1aa39f2921a277b736079f5..34c08c325407c2a61acebf6ce70ef1bae27f7e60 100755 (executable)
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -769,4 +769,23 @@ test_expect_failure 'avoid traversing into ignored directories' '
        test_cmp trace.expect trace.relevant
 '
 
+test_expect_failure 'traverse into directories that may have ignored entries' '
+       test_when_finished rm -f output &&
+       test_create_repo need-to-traverse-into-hierarchy &&
+       (
+               cd need-to-traverse-into-hierarchy &&
+               mkdir -p modules/foobar/src/generated &&
+               > modules/foobar/src/generated/code.c &&
+               > modules/foobar/Makefile &&
+               echo "/modules/**/src/generated/" >.gitignore &&
+
+               git clean -fX modules/foobar >../output &&
+
+               grep Removing ../output &&
+
+               test_path_is_missing modules/foobar/src/generated/code.c &&
+               test_path_is_file modules/foobar/Makefile
+       )
+'
+
 test_done