diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-08-13 18:14:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-08-13 14:14:43 -0700 |
| commit | 86016ec3042ec52eef9f45386c50384419d030c0 (patch) | |
| tree | 9eeb7818b27edc24d7d7e29818f1615fc05ca5c1 /unpack-trees.c | |
| parent | 383480ba4ffc15b975e324bf7abbc01324d9935e (diff) | |
| download | git-86016ec3042ec52eef9f45386c50384419d030c0.tar.gz | |
unpack-trees: don't shadow global var the_index
This function mark_new_skip_worktree() has an argument named the_index
which is also the name of a global variable. While they have different
types (the global the_index is not a pointer) mistakes can easily
happen and it's also confusing for readers. Rename the function
argument to something other than the_index.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index c07a6cd646..f50b463f65 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1238,7 +1238,7 @@ static int clear_ce_flags(struct cache_entry **cache, int nr, * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout */ static void mark_new_skip_worktree(struct exclude_list *el, - struct index_state *the_index, + struct index_state *istate, int select_flag, int skip_wt_flag) { int i; @@ -1247,8 +1247,8 @@ static void mark_new_skip_worktree(struct exclude_list *el, * 1. Pretend the narrowest worktree: only unmerged entries * are checked out */ - for (i = 0; i < the_index->cache_nr; i++) { - struct cache_entry *ce = the_index->cache[i]; + for (i = 0; i < istate->cache_nr; i++) { + struct cache_entry *ce = istate->cache[i]; if (select_flag && !(ce->ce_flags & select_flag)) continue; @@ -1263,8 +1263,7 @@ static void mark_new_skip_worktree(struct exclude_list *el, * 2. Widen worktree according to sparse-checkout file. * Matched entries will have skip_wt_flag cleared (i.e. "in") */ - clear_ce_flags(the_index->cache, the_index->cache_nr, - select_flag, skip_wt_flag, el); + clear_ce_flags(istate->cache, istate->cache_nr, select_flag, skip_wt_flag, el); } static int verify_absent(const struct cache_entry *, |