Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx>
---
diff.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/diff.c b/diff.c
index 136d44b455..975e095ed2 100644
--- a/diff.c
+++ b/diff.c
@@ -3460,7 +3460,7 @@ static int reuse_worktree_file(const char *name, const struct object_id *oid, in
* by diff-cache --cached, which does read the cache before
* calling us.
*/
- if (!active_cache)
+ if (!the_index.cache)
return 0;
/* We want to avoid the working directory if our caller
@@ -3483,10 +3483,10 @@ static int reuse_worktree_file(const char *name, const struct object_id *oid, in
return 0;
len = strlen(name);
- pos = cache_name_pos(name, len);
+ pos = index_name_pos(&the_index, name, len);
if (pos < 0)
return 0;
- ce = active_cache[pos];
+ ce = the_index.cache[pos];
/*
* This is not the sha1 we are looking for, or
@@ -3506,7 +3506,7 @@ static int reuse_worktree_file(const char *name, const struct object_id *oid, in
* If ce matches the file in the work tree, we can reuse it.
*/
if (ce_uptodate(ce) ||
- (!lstat(name, &st) && !ce_match_stat(ce, &st, 0)))
+ (!lstat(name, &st) && !ie_match_stat(&the_index, ce, &st, 0)))
return 1;
return 0;
@@ -4216,14 +4216,14 @@ void diff_setup_done(struct diff_options *options)
if (options->detect_rename && options->rename_limit < 0)
options->rename_limit = diff_rename_limit_default;
if (options->setup & DIFF_SETUP_USE_CACHE) {
- if (!active_cache)
+ if (!the_index.cache)
/* read-cache does not die even when it fails
* so it is safe for us to do this here. Also
* it does not smudge active_cache or active_nr
* when it fails, so we do not have to worry about
* cleaning it up ourselves either.
*/
- read_cache();
+ read_index(&the_index);
}
if (hexsz < options->abbrev)
options->abbrev = hexsz; /* full */
--
2.18.0.rc0.333.g22e6ee6cdf
