Skip to content

Commit 8165ec4

Browse files
committed
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 <[email protected]>
1 parent 046e6ff commit 8165ec4

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

apply.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4316,7 +4316,7 @@ static int add_index_file(struct apply_state *state,
43164316
"created file '%s'"),
43174317
path);
43184318
}
4319-
fill_stat_cache_info(ce, &st);
4319+
fill_stat_cache_info(state->repo->index, ce, &st);
43204320
}
43214321
if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {
43224322
discard_cache_entry(ce);

builtin/update-index.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static int add_one_path(const struct cache_entry *old, const char *path, int len
280280
memcpy(ce->name, path, len);
281281
ce->ce_flags = create_ce_flags(0);
282282
ce->ce_namelen = len;
283-
fill_stat_cache_info(ce, st);
283+
fill_stat_cache_info(&the_index, ce, st);
284284
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
285285

286286
if (index_path(&the_index, &ce->oid, path, st,

cache.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ extern int match_stat_data(const struct stat_data *sd, struct stat *st);
823823
extern int match_stat_data_racy(const struct index_state *istate,
824824
const struct stat_data *sd, struct stat *st);
825825

826-
extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
826+
extern void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st);
827827

828828
#define REFRESH_REALLY 0x0001 /* ignore_valid */
829829
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */

entry.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ static int write_entry(struct cache_entry *ce,
376376
if (lstat(ce->name, &st) < 0)
377377
return error_errno("unable to stat just-written file %s",
378378
ce->name);
379-
fill_stat_cache_info(ce, &st);
379+
fill_stat_cache_info(state->istate, ce, &st);
380380
ce->ce_flags |= CE_UPDATE_IN_BASE;
381381
mark_fsmonitor_invalid(state->istate, ce);
382382
state->istate->cache_changed |= CE_ENTRY_CHANGED;

read-cache.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)
194194
* cache, ie the parts that aren't tracked by GIT, and only used
195195
* to validate the cache.
196196
*/
197-
void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
197+
void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st)
198198
{
199199
fill_stat_data(&ce->ce_stat_data, st);
200200

@@ -718,7 +718,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
718718
memcpy(ce->name, path, namelen);
719719
ce->ce_namelen = namelen;
720720
if (!intent_only)
721-
fill_stat_cache_info(ce, st);
721+
fill_stat_cache_info(istate, ce, st);
722722
else
723723
ce->ce_flags |= CE_INTENT_TO_ADD;
724724

@@ -1437,7 +1437,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
14371437
updated = make_empty_cache_entry(istate, ce_namelen(ce));
14381438
copy_cache_entry(updated, ce);
14391439
memcpy(updated->name, ce->name, ce->ce_namelen + 1);
1440-
fill_stat_cache_info(updated, &st);
1440+
fill_stat_cache_info(istate, updated, &st);
14411441
/*
14421442
* If ignore_valid is not set, we should leave CE_VALID bit
14431443
* alone. Otherwise, paths marked with --no-assume-unchanged

0 commit comments

Comments
 (0)