The sixth batch for 2.26

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

diff --git a/unpack-trees.c b/unpack-trees.c
index da4d6d4ec01d6ca96e9efb08e828e8694567cd9f..1ecdab330408a1cca7f703b6f2dc8d9b11ae0261 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -291,11 +291,11 @@ static void load_gitmodules_file(struct index_state *index,
        if (pos >= 0) {
                struct cache_entry *ce = index->cache[pos];
                if (!state && ce->ce_flags & CE_WT_REMOVE) {
-                       repo_read_gitmodules(the_repository);
+                       repo_read_gitmodules(the_repository, 0);
                } else if (state && (ce->ce_flags & CE_UPDATE)) {
                        submodule_free(the_repository);
                        checkout_entry(ce, state, NULL, NULL);
-                       repo_read_gitmodules(the_repository);
+                       repo_read_gitmodules(the_repository, 0);
                }
        }
 }
@@ -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++;