Merge branch 'rs/micro-cleanups'

[thirdparty/git.git] / unpack-trees.c

diff --git a/unpack-trees.c b/unpack-trees.c
index 602f4db8d0113af18abb7cdee2c0b2ff6df8a22d..1ecdab330408a1cca7f703b6f2dc8d9b11ae0261 100644 (file)
--- 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++;