fill_stat_cache_info(): prepare for an fsmonitor fix
We will need to pass down the `struct index_state` to `mark_fsmonitor_valid()` for an upcoming bug fix, and this here function calls that there function, so we need to extend the signature of `fill_stat_cache_info()` first. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
May 24, 2019 at 05:23 UTC
d4c0a3ac78cf2fc16c144bf720d1451fcd1e267d
5 files changed
+7
-7
apply.c
+1
-1
@@ -4310,7 +4310,7 @@ static int add_index_file(struct apply_state *state,
4310
"created file '%s'"),
4311
path);
4312
}
4313
- fill_stat_cache_info(ce, &st);
4313
+ fill_stat_cache_info(state->repo->index, ce, &st);
4314
}
4315
if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {
4316
discard_cache_entry(ce);
builtin/update-index.c
+1
-1
@@ -280,7 +280,7 @@ static int add_one_path(const struct cache_entry *old, const char *path, int len
280
memcpy(ce->name, path, len);
281
ce->ce_flags = create_ce_flags(0);
282
ce->ce_namelen = len;
283
- fill_stat_cache_info(ce, st);
283
+ fill_stat_cache_info(&the_index, ce, st);
284
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
285
286
if (index_path(&the_index, &ce->oid, path, st,
cache.h
+1
-1
@@ -826,7 +826,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st);
826
int match_stat_data_racy(const struct index_state *istate,
827
const struct stat_data *sd, struct stat *st);
828
829
-void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
829
+void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st);
830
831
#define REFRESH_REALLY 0x0001 /* ignore_valid */
832
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */
entry.c
+1
-1
@@ -373,7 +373,7 @@ finish:
373
if (lstat(ce->name, &st) < 0)
374
return error_errno("unable to stat just-written file %s",
375
ce->name);
376
- fill_stat_cache_info(ce, &st);
376
+ fill_stat_cache_info(state->istate, ce, &st);
377
ce->ce_flags |= CE_UPDATE_IN_BASE;
378
mark_fsmonitor_invalid(state->istate, ce);
379
state->istate->cache_changed |= CE_ENTRY_CHANGED;
read-cache.c
+3
-3
@@ -195,7 +195,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)
195
* cache, ie the parts that aren't tracked by GIT, and only used
196
* to validate the cache.
197
*/
198
-void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
198
+void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st)
199
{
200
fill_stat_data(&ce->ce_stat_data, st);
201
@@ -728,7 +728,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
728
memcpy(ce->name, path, namelen);
729
ce->ce_namelen = namelen;
730
if (!intent_only)
731
- fill_stat_cache_info(ce, st);
731
+ fill_stat_cache_info(istate, ce, st);
732
else
733
ce->ce_flags |= CE_INTENT_TO_ADD;
734
@@ -1447,7 +1447,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
1447
updated = make_empty_cache_entry(istate, ce_namelen(ce));
1448
copy_cache_entry(updated, ce);
1449
memcpy(updated->name, ce->name, ce->ce_namelen + 1);
1450
- fill_stat_cache_info(updated, &st);
1450
+ fill_stat_cache_info(istate, updated, &st);
1451
/*
1452
* If ignore_valid is not set, we should leave CE_VALID bit
1453
* alone. Otherwise, paths marked with --no-assume-unchanged