зеркало из https://github.com/microsoft/git.git
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>
This commit is contained in:
Родитель
cfd635c742
Коммит
d4c0a3ac78
2
apply.c
2
apply.c
|
@ -4310,7 +4310,7 @@ static int add_index_file(struct apply_state *state,
|
|||
"created file '%s'"),
|
||||
path);
|
||||
}
|
||||
fill_stat_cache_info(ce, &st);
|
||||
fill_stat_cache_info(state->repo->index, ce, &st);
|
||||
}
|
||||
if (write_object_file(buf, size, blob_type, &ce->oid) < 0) {
|
||||
discard_cache_entry(ce);
|
||||
|
|
|
@ -280,7 +280,7 @@ static int add_one_path(const struct cache_entry *old, const char *path, int len
|
|||
memcpy(ce->name, path, len);
|
||||
ce->ce_flags = create_ce_flags(0);
|
||||
ce->ce_namelen = len;
|
||||
fill_stat_cache_info(ce, st);
|
||||
fill_stat_cache_info(&the_index, ce, st);
|
||||
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
|
||||
|
||||
if (index_path(&the_index, &ce->oid, path, st,
|
||||
|
|
2
cache.h
2
cache.h
|
@ -826,7 +826,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st);
|
|||
int match_stat_data_racy(const struct index_state *istate,
|
||||
const struct stat_data *sd, struct stat *st);
|
||||
|
||||
void fill_stat_cache_info(struct cache_entry *ce, struct stat *st);
|
||||
void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st);
|
||||
|
||||
#define REFRESH_REALLY 0x0001 /* ignore_valid */
|
||||
#define REFRESH_UNMERGED 0x0002 /* allow unmerged */
|
||||
|
|
2
entry.c
2
entry.c
|
@ -373,7 +373,7 @@ finish:
|
|||
if (lstat(ce->name, &st) < 0)
|
||||
return error_errno("unable to stat just-written file %s",
|
||||
ce->name);
|
||||
fill_stat_cache_info(ce, &st);
|
||||
fill_stat_cache_info(state->istate, ce, &st);
|
||||
ce->ce_flags |= CE_UPDATE_IN_BASE;
|
||||
mark_fsmonitor_invalid(state->istate, ce);
|
||||
state->istate->cache_changed |= CE_ENTRY_CHANGED;
|
||||
|
|
|
@ -195,7 +195,7 @@ int match_stat_data(const struct stat_data *sd, struct stat *st)
|
|||
* cache, ie the parts that aren't tracked by GIT, and only used
|
||||
* to validate the cache.
|
||||
*/
|
||||
void fill_stat_cache_info(struct cache_entry *ce, struct stat *st)
|
||||
void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st)
|
||||
{
|
||||
fill_stat_data(&ce->ce_stat_data, st);
|
||||
|
||||
|
@ -728,7 +728,7 @@ int add_to_index(struct index_state *istate, const char *path, struct stat *st,
|
|||
memcpy(ce->name, path, namelen);
|
||||
ce->ce_namelen = namelen;
|
||||
if (!intent_only)
|
||||
fill_stat_cache_info(ce, st);
|
||||
fill_stat_cache_info(istate, ce, st);
|
||||
else
|
||||
ce->ce_flags |= CE_INTENT_TO_ADD;
|
||||
|
||||
|
@ -1447,7 +1447,7 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
|
|||
updated = make_empty_cache_entry(istate, ce_namelen(ce));
|
||||
copy_cache_entry(updated, ce);
|
||||
memcpy(updated->name, ce->name, ce->ce_namelen + 1);
|
||||
fill_stat_cache_info(updated, &st);
|
||||
fill_stat_cache_info(istate, updated, &st);
|
||||
/*
|
||||
* If ignore_valid is not set, we should leave CE_VALID bit
|
||||
* alone. Otherwise, paths marked with --no-assume-unchanged
|
||||
|
|
Загрузка…
Ссылка в новой задаче