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>
Jameson Miller committed
Jul 2, 2018 at 19:49 UTC
768d7965068189ec5287ac53b4b55bfd443bb456
3 files changed
+7
-6
cache.h
+1
-1
@@ -751,7 +751,7 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
751
#define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */
752
#define REFRESH_IN_PORCELAIN 0x0020 /* user friendly output, not "needs update" */
753
extern int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg);
754
-extern struct cache_entry *refresh_cache_entry(struct cache_entry *, unsigned int);
754
+extern struct cache_entry *refresh_cache_entry(struct index_state *, struct cache_entry *, unsigned int);
755
756
/*
757
* Opportunistically update the index but do not complain if we can't.
merge-recursive.c
+1
-1
@@ -323,7 +323,7 @@ static int add_cacheinfo(struct merge_options *o,
323
if (refresh) {
324
struct cache_entry *nce;
325
326
- nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
326
+ nce = refresh_cache_entry(&the_index, ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING);
327
if (!nce)
328
return err(o, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path);
329
if (nce != ce)
read-cache.c
+5
-4
@@ -767,7 +767,7 @@ struct cache_entry *make_cache_entry(unsigned int mode,
767
ce->ce_namelen = len;
768
ce->ce_mode = create_ce_mode(mode);
769
770
- ret = refresh_cache_entry(ce, refresh_options);
770
+ ret = refresh_cache_entry(&the_index, ce, refresh_options);
771
if (ret != ce)
772
free(ce);
773
return ret;
@@ -1473,10 +1473,11 @@ int refresh_index(struct index_state *istate, unsigned int flags,
1473
return has_errors;
1474
}
1475
1476
-struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
1477
- unsigned int options)
1476
+struct cache_entry *refresh_cache_entry(struct index_state *istate,
1477
+ struct cache_entry *ce,
1478
+ unsigned int options)
1479
{
1479
- return refresh_cache_ent(&the_index, ce, options, NULL, NULL);
1480
+ return refresh_cache_ent(istate, ce, options, NULL, NULL);
1481
}
1482
1483