Both "struct untracked_cache" and "struct dir_struct" contain fields of
the type "struct oid_stat". The latter used to be called "sha1_stat"
before 4b33e60 ("dir: convert struct sha1_stat to use object_id",
2018-01-28). Although this struct was renamed, the previously mentioned
fields are still named with an "ss_" prefix ("ss_info_exclude" and
"ss_excludes_file"), which refers to the old "sha1_stat". As this can be
confusing, let's rename these fields. Since "struct oid_stat" is used to
query the validity of cached data, a better naming alternative would be
"info_exclude_validity" and "excludes_file_validity".
Helped-by: Junio C Hamano <gitster@xxxxxxxxx>
Signed-off-by: Matheus Tavares <matheus.bernardino@xxxxxx>
---
dir.c | 34 ++++++++++++++++------------
dir.h | 8 +++----
t/helper/test-dump-untracked-cache.c | 5 ++--
3 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/dir.c b/dir.c
index ab2e5b8717..92226b1af2 100644
--- a/dir.c
+++ b/dir.c
@@ -2613,15 +2613,17 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
/* Validate $GIT_DIR/info/exclude and core.excludesfile */
root = dir->untracked->root;
- if (!oideq(&dir->ss_info_exclude.oid,
- &dir->untracked->ss_info_exclude.oid)) {
+ if (!oideq(&dir->info_exclude_validity.oid,
+ &dir->untracked->info_exclude_validity.oid)) {
invalidate_gitignore(dir->untracked, root);
- dir->untracked->ss_info_exclude = dir->ss_info_exclude;
+ dir->untracked->info_exclude_validity =
+ dir->info_exclude_validity;
}
- if (!oideq(&dir->ss_excludes_file.oid,
- &dir->untracked->ss_excludes_file.oid)) {
+ if (!oideq(&dir->excludes_file_validity.oid,
+ &dir->untracked->excludes_file_validity.oid)) {
invalidate_gitignore(dir->untracked, root);
- dir->untracked->ss_excludes_file = dir->ss_excludes_file;
+ dir->untracked->excludes_file_validity =
+ dir->excludes_file_validity;
}
/* Make sure this directory is not dropped out at saving phase */
@@ -2884,14 +2886,16 @@ void setup_standard_excludes(struct dir_struct *dir)
excludes_file = xdg_config_home("ignore");
if (excludes_file && !access_or_warn(excludes_file, R_OK, 0))
add_patterns_from_file_1(dir, excludes_file,
- dir->untracked ? &dir->ss_excludes_file : NULL);
+ dir->untracked ?
+ &dir->excludes_file_validity : NULL);
/* per repository user preference */
if (startup_info->have_repository) {
const char *path = git_path_info_exclude();
if (!access_or_warn(path, R_OK, 0))
add_patterns_from_file_1(dir, path,
- dir->untracked ? &dir->ss_info_exclude : NULL);
+ dir->untracked ?
+ &dir->info_exclude_validity : NULL);
}
}
@@ -3037,8 +3041,10 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
const unsigned hashsz = the_hash_algo->rawsz;
ouc = xcalloc(1, sizeof(*ouc));
- stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
- stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
+ stat_data_to_disk(&ouc->info_exclude_stat,
+ &untracked->info_exclude_validity.stat);
+ stat_data_to_disk(&ouc->excludes_file_stat,
+ &untracked->excludes_file_validity.stat);
ouc->dir_flags = htonl(untracked->dir_flags);
varint_len = encode_varint(untracked->ident.len, varbuf);
@@ -3046,8 +3052,8 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
strbuf_addbuf(out, &untracked->ident);
strbuf_add(out, ouc, sizeof(*ouc));
- strbuf_add(out, untracked->ss_info_exclude.oid.hash, hashsz);
- strbuf_add(out, untracked->ss_excludes_file.oid.hash, hashsz);
+ strbuf_add(out, untracked->info_exclude_validity.oid.hash, hashsz);
+ strbuf_add(out, untracked->excludes_file_validity.oid.hash, hashsz);
strbuf_add(out, untracked->exclude_per_dir, strlen(untracked->exclude_per_dir) + 1);
FREE_AND_NULL(ouc);
@@ -3250,10 +3256,10 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long
uc = xcalloc(1, sizeof(*uc));
strbuf_init(&uc->ident, ident_len);
strbuf_add(&uc->ident, ident, ident_len);
- load_oid_stat(&uc->ss_info_exclude,
+ load_oid_stat(&uc->info_exclude_validity,
next + ouc_offset(info_exclude_stat),
next + offset);
- load_oid_stat(&uc->ss_excludes_file,
+ load_oid_stat(&uc->excludes_file_validity,
next + ouc_offset(excludes_file_stat),
next + offset + hashsz);
uc->dir_flags = get_be32(next + ouc_offset(dir_flags));
diff --git a/dir.h b/dir.h
index 5855c065a6..6c3aaeba71 100644
--- a/dir.h
+++ b/dir.h
@@ -186,8 +186,8 @@ struct untracked_cache_dir {
};
struct untracked_cache {
- struct oid_stat ss_info_exclude;
- struct oid_stat ss_excludes_file;
+ struct oid_stat info_exclude_validity;
+ struct oid_stat excludes_file_validity;
const char *exclude_per_dir;
struct strbuf ident;
/*
@@ -334,8 +334,8 @@ struct dir_struct {
/* Enable untracked file cache if set */
struct untracked_cache *untracked;
- struct oid_stat ss_info_exclude;
- struct oid_stat ss_excludes_file;
+ struct oid_stat info_exclude_validity;
+ struct oid_stat excludes_file_validity;
unsigned unmanaged_exclude_files;
};
diff --git a/t/helper/test-dump-untracked-cache.c b/t/helper/test-dump-untracked-cache.c
index cf0f2c7228..568a4588bb 100644
--- a/t/helper/test-dump-untracked-cache.c
+++ b/t/helper/test-dump-untracked-cache.c
@@ -56,8 +56,9 @@ int cmd__dump_untracked_cache(int ac, const char **av)
printf("no untracked cache\n");
return 0;
}
- printf("info/exclude %s\n", oid_to_hex(&uc->ss_info_exclude.oid));
- printf("core.excludesfile %s\n", oid_to_hex(&uc->ss_excludes_file.oid));
+ printf("info/exclude %s\n", oid_to_hex(&uc->info_exclude_validity.oid));
+ printf("core.excludesfile %s\n",
+ oid_to_hex(&uc->excludes_file_validity.oid));
printf("exclude_per_dir %s\n", uc->exclude_per_dir);
printf("flags %08x\n", uc->dir_flags);
if (uc->root)
--
2.25.1
