If folks prefer this behavior, I'll squash this patch into the previous.
Otherwise, I'll just drop this patch from the series.
---
dir.c | 2 +-
t/t7300-clean.sh | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dir.c b/dir.c
index f55e24f149..bad75e9fbd 100644
--- a/dir.c
+++ b/dir.c
@@ -403,7 +403,7 @@ static int match_pathspec_item(const struct pathspec_item
*item, int prefix,
* The submodules themselves will be able to perform more
* accurate matching to determine if the pathspec matches.
*/
- return MATCHED_RECURSIVELY_LEADING_PATHSPEC;
+ return MATCHED_RECURSIVELY;
}
return 0;
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 889b3401e4..913ea6bda3 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -685,12 +685,12 @@ test_expect_success 'git clean handles being told what to
clean, with -d' '
test_path_is_missing d2/ut
'
-test_expect_success 'git clean handles being told a glob to clean' '
+test_expect_success 'git clean will not recurse with globs without -d' '
mkdir -p d1 d2 &&
touch d1/ut d2/ut &&
git clean -f "*ut" &&
- test_path_is_missing d1/ut &&
- test_path_is_missing d2/ut
+ test_path_is_file d1/ut &&
+ test_path_is_file d2/ut
'
test_expect_success 'git clean handles being told a glob to clean with -d' '
--
2.17.0.7.g0b50f94d69
