[PATCH v3 06/14] update-index: use istate->cache_changed
From: Derrick Stolee <dstolee@microsoft.com>
This is a mechanical replacement of active_cache_changed.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
builtin/update-index.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 2b03b29261b..70ca47e712c 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -241,7 +241,7 @@ static int mark_ce_flags(const char *path, int flag, int mark)
istate->cache[pos]->ce_flags &= ~flag;
istate->cache[pos]->ce_flags |= CE_UPDATE_IN_BASE;
cache_tree_invalidate_path(istate, path);
- active_cache_changed |= CE_ENTRY_CHANGED;
+ istate->cache_changed |= CE_ENTRY_CHANGED;
return 0;
}
return -1;
@@ -915,7 +915,7 @@ static enum parse_opt_result unresolve_callback(
*has_errors = do_unresolve(ctx->argc, ctx->argv,
prefix, prefix ? strlen(prefix) : 0);
if (*has_errors)
- active_cache_changed = 0;
+ repo->index->cache_changed = 0;
ctx->argv += ctx->argc - 1;
ctx->argc = 1;
@@ -936,7 +936,7 @@ static enum parse_opt_result reupdate_callback(
setup_work_tree();
*has_errors = do_reupdate(ctx->argc, ctx->argv, prefix);
if (*has_errors)
- active_cache_changed = 0;
+ repo->index->cache_changed = 0;
ctx->argv += ctx->argc - 1;
ctx->argc = 1;
@@ -1135,7 +1135,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
INDEX_FORMAT_LB, INDEX_FORMAT_UB);
if (repo->index->version != preferred_index_format)
- active_cache_changed |= SOMETHING_CHANGED;
+ repo->index->cache_changed |= SOMETHING_CHANGED;
repo->index->version = preferred_index_format;
}
@@ -1223,7 +1223,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
report(_("fsmonitor disabled"));
}
- if (active_cache_changed || force_write) {
+ if (repo->index->cache_changed || force_write) {
if (newfd < 0) {
if (refresh_args.flags & REFRESH_QUIET)
exit(128);
--
gitgitgadget
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>