path: root/split-index.c
diff options
authorThomas Gummerer <>2018-12-20 13:48:16 (GMT)
committerJunio C Hamano <>2019-01-02 23:28:05 (GMT)
commit6fdc2057225ad1ae735ecaacdcace77c8b0b6b76 (patch)
treed40292266321be1a88645a3f8c9c091836ed129f /split-index.c
parent536ec1839dbde8b9a6b38e6ccb5ab01b2b6311f9 (diff)
read-cache: add invalidate parameter to remove_marked_cache_entries
When marking cache entries for removal, and later removing them all at once using 'remove_marked_cache_entries()', cache entries currently have to be invalidated manually in the cache tree and in the untracked cache. Add an invalidate flag to the function. With the flag set, the function will take care of invalidating the path in the cache tree and in the untracked cache. Note that the current callsites already do the invalidation properly in other places, so we're just passing 0 from there to keep the status quo. This will be useful in a subsequent commit. Signed-off-by: Thomas Gummerer <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'split-index.c')
1 files changed, 1 insertions, 1 deletions
diff --git a/split-index.c b/split-index.c
index 5820412..8aebc36 100644
--- a/split-index.c
+++ b/split-index.c
@@ -162,7 +162,7 @@ void merge_base_index(struct index_state *istate)
ewah_each_bit(si->replace_bitmap, replace_entry, istate);
ewah_each_bit(si->delete_bitmap, mark_entry_for_delete, istate);
if (si->nr_deletions)
- remove_marked_cache_entries(istate);
+ remove_marked_cache_entries(istate, 0);
for (i = si->nr_replacements; i < si->saved_cache_nr; i++) {
if (!ce_namelen(si->saved_cache[i]))