[PATCH 05/12] update-index: use istate->cache over active_cache
From: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
builtin/update-index.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index c9a6cde97da..0616c786410 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -235,12 +235,12 @@ static int mark_ce_flags(const char *path, int flag, int mark)
int namelen = strlen(path);
int pos = cache_name_pos(path, namelen);
if (0 <= pos) {
- mark_fsmonitor_invalid(istate, active_cache[pos]);
+ mark_fsmonitor_invalid(istate, istate->cache[pos]);
if (mark)
- active_cache[pos]->ce_flags |= flag;
+ istate->cache[pos]->ce_flags |= flag;
else
- active_cache[pos]->ce_flags &= ~flag;
- active_cache[pos]->ce_flags |= CE_UPDATE_IN_BASE;
+ 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;
return 0;
@@ -331,7 +331,7 @@ static int process_directory(const char *path, int len, struct stat *st)
/* Exact match: file or existing gitlink */
if (pos >= 0) {
- const struct cache_entry *ce = active_cache[pos];
+ const struct cache_entry *ce = istate->cache[pos];
if (S_ISGITLINK(ce->ce_mode)) {
/* Do nothing to the index if there is no HEAD! */
@@ -347,7 +347,7 @@ static int process_directory(const char *path, int len, struct stat *st)
/* Inexact match: is there perhaps a subdirectory match? */
pos = -pos-1;
while (pos < active_nr) {
- const struct cache_entry *ce = active_cache[pos++];
+ const struct cache_entry *ce = istate->cache[pos++];
if (strncmp(ce->name, path, len))
break;
@@ -378,7 +378,7 @@ static int process_path(const char *path, struct stat *st, int stat_errno)
return error("'%s' is beyond a symbolic link", path);
pos = cache_name_pos(path, len);
- ce = pos < 0 ? NULL : active_cache[pos];
+ ce = pos < 0 ? NULL : istate->cache[pos];
if (ce && ce_skip_worktree(ce)) {
/*
* working directory version is assumed "good"
@@ -440,7 +440,7 @@ static void chmod_path(char flip, const char *path)
pos = cache_name_pos(path, strlen(path));
if (pos < 0)
goto fail;
- ce = active_cache[pos];
+ ce = istate->cache[pos];
if (chmod_cache_entry(ce, flip) < 0)
goto fail;
@@ -639,7 +639,7 @@ static int unresolve_one(const char *path)
/* already merged */
pos = unmerge_cache_entry_at(pos);
if (pos < active_nr) {
- const struct cache_entry *ce = active_cache[pos];
+ const struct cache_entry *ce = istate->cache[pos];
if (ce_stage(ce) &&
ce_namelen(ce) == namelen &&
!memcmp(ce->name, path, namelen))
@@ -653,7 +653,7 @@ static int unresolve_one(const char *path)
*/
pos = -pos-1;
if (pos < active_nr) {
- const struct cache_entry *ce = active_cache[pos];
+ const struct cache_entry *ce = istate->cache[pos];
if (ce_namelen(ce) == namelen &&
!memcmp(ce->name, path, namelen)) {
fprintf(stderr,
@@ -749,7 +749,7 @@ static int do_reupdate(int ac, const char **av,
has_head = 0;
redo:
for (pos = 0; pos < active_nr; pos++) {
- const struct cache_entry *ce = active_cache[pos];
+ const struct cache_entry *ce = istate->cache[pos];
struct cache_entry *old = NULL;
int save_nr;
char *path;
--
gitgitgadget
Derrick Stolee via GitGitGadget <gitgitgadget@gmail.com>