summaryrefslogtreecommitdiff
path: root/unpack-trees.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-14 20:54:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-14 20:54:22 (GMT)
commit433b8aac2eb7a8bc3e383a072f7df7d15c4aabbb (patch)
treeeb79af1dec711d05bc19b0aff968675489d3d8de /unpack-trees.c
parent4a77434bc83c07c17ddc321b3892337b5533eda1 (diff)
parentf998a3f1e588d73ed7285cb14ac4839f63f6dc82 (diff)
downloadgit-433b8aac2eb7a8bc3e383a072f7df7d15c4aabbb.zip
git-433b8aac2eb7a8bc3e383a072f7df7d15c4aabbb.tar.gz
git-433b8aac2eb7a8bc3e383a072f7df7d15c4aabbb.tar.bz2
Merge branch 'ds/sparse-checkout-harden'
Some rough edges in the sparse-checkout feature, especially around the cone mode, have been cleaned up. * ds/sparse-checkout-harden: sparse-checkout: fix cone mode behavior mismatch sparse-checkout: improve docs around 'set' in cone mode sparse-checkout: escape all glob characters on write sparse-checkout: use C-style quotes in 'list' subcommand sparse-checkout: unquote C-style strings over --stdin sparse-checkout: write escaped patterns in cone mode sparse-checkout: properly match escaped characters sparse-checkout: warn on globs in cone patterns sparse-checkout: detect short patterns sparse-checkout: cone mode does not recognize "**" sparse-checkout: fix documentation typo for core.sparseCheckoutCone clone: fix --sparse option with URLs sparse-checkout: create leading directories t1091: improve here-docs t1091: use check_files to reduce boilerplate
Diffstat (limited to 'unpack-trees.c')
-rw-r--r--unpack-trees.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c
index 602f4db..1ecdab3 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1420,7 +1420,7 @@ static int clear_ce_flags_1(struct index_state *istate,
name, &dtype, pl, istate);
if (ret == UNDECIDED)
ret = default_match;
- if (ret == MATCHED)
+ if (ret == MATCHED || ret == MATCHED_RECURSIVE)
ce->ce_flags &= ~clear_mask;
cache++;
progress_nr++;