[PATCH 13/15] read-cache: remove_marked_cache_entries to wipe selected submodules.
From: Stefan Beller <hidden>
Date: 2017-02-16 00:39:03
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2017-02-16 · Re: [PATCH 13/15] read-cache: remove_marked_cache_entries to wipe selected submodules. · Junio C Hamano <hidden>
Signed-off-by: Stefan Beller <redacted> --- read-cache.c | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/read-cache.c b/read-cache.c
index 9054369dd0..b78a7f02e3 100644
--- a/read-cache.c
+++ b/read-cache.c@@ -18,6 +18,7 @@ #include "varint.h" #include "split-index.h" #include "utf8.h" +#include "submodule.h" /* Mask for the name length in ce_flags in the on-disk index */
@@ -532,6 +533,8 @@ void remove_marked_cache_entries(struct index_state *istate) for (i = j = 0; i < istate->cache_nr; i++) { if (ce_array[i]->ce_flags & CE_REMOVE) { + if (is_active_submodule_with_strategy(ce_array[i], SM_UPDATE_UNSPECIFIED)) + submodule_go_from_to(ce_array[i]->name, "HEAD", NULL, 0, 1); remove_name_hash(istate, ce_array[i]); save_or_free_index_entry(istate, ce_array[i]); }
--
2.12.0.rc1.16.ge4278d41a0.dirty