read-cache: mark updated entries for split index

diff --git a/builtin/update-index.c b/builtin/update-index.c
index e0e881b3e710c36e470e61e909ca84f077c0fbd0..f7a19c47a6094ccc4fbb8a8b4048b744bc7f12e4 100644 (file)
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -55,7 +55,8 @@ static int mark_ce_flags(const char *path, int flag, int mark)
                        active_cache[pos]->ce_flags |= flag;
                else
                        active_cache[pos]->ce_flags &= ~flag;
-               cache_tree_invalidate_path(active_cache_tree, path);
+               active_cache[pos]->ce_flags |= CE_UPDATE_IN_BASE;
+               cache_tree_invalidate_path(&the_index, path);
                active_cache_changed |= CE_ENTRY_CHANGED;
                return 0;
        }
@@ -267,7 +268,8 @@ static void chmod_path(int flip, const char *path)
        default:
                goto fail;
        }
-       cache_tree_invalidate_path(active_cache_tree, path);
+       cache_tree_invalidate_path(&the_index, path);
+       ce->ce_flags |= CE_UPDATE_IN_BASE;
        active_cache_changed |= CE_ENTRY_CHANGED;
        report("chmod %cx '%s'", flip, path);
        return;