read-cache.c: remove implicit dependency on the_index

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/read-cache.c b/read-cache.c
index 6f772b2885c109e6f063acd5cfb038d826b00b0d..563500fe987b22c79280fe2e198411ce30fec69f 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -823,7 +823,7 @@ struct cache_entry *make_cache_entry(struct index_state *istate,
        ce->ce_namelen = len;
        ce->ce_mode = create_ce_mode(mode);
 
        ce->ce_namelen = len;
        ce->ce_mode = create_ce_mode(mode);
 

-       ret = refresh_cache_entry(&the_index, ce, refresh_options);
+       ret = refresh_cache_entry(istate, ce, refresh_options);

        if (ret != ce)
                discard_cache_entry(ce);
        return ret;
        if (ret != ce)
                discard_cache_entry(ce);
        return ret;


@@ -1493,7 +1493,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
                if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
                        continue;
 
                if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
                        continue;
 

-               if (pathspec && !ce_path_match(&the_index, ce, pathspec, seen))
+               if (pathspec && !ce_path_match(istate, ce, pathspec, seen))

                        filtered = 1;
 
                if (ce_stage(ce)) {
                        filtered = 1;
 
                if (ce_stage(ce)) {