diff options
| author | Jameson Miller <jamill@microsoft.com> | 2018-07-02 21:49:29 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-07-03 19:58:15 +0200 |
| commit | 768d7965068189ec5287ac53b4b55bfd443bb456 (patch) | |
| tree | d7e6fc5e2e8fd15d3207c7155965bcc1f12a1fac /merge-recursive.c | |
| parent | Git 2.18 (diff) | |
| download | git-768d7965068189ec5287ac53b4b55bfd443bb456.tar.xz git-768d7965068189ec5287ac53b4b55bfd443bb456.zip | |
read-cache: teach refresh_cache_entry to take istate
Refactor refresh_cache_entry() to work on a specific index, instead of
implicitly using the_index. This is in preparation for making the
make_cache_entry function apply to a specific index.
Signed-off-by: Jameson Miller <jamill@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index f110e1c5ec..11a767cc72 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -323,7 +323,7 @@ static int add_cacheinfo(struct merge_options *o, if (refresh) { struct cache_entry *nce; - nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING); + nce = refresh_cache_entry(&the_index, ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING); if (!nce) return err(o, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path); if (nce != ce) |