[PATCH v2 10/10] dir: do not use untracked cache ident anymore
flat view
STALE3769d
From: Christian Couder <hidden>
Date: 2016-06-15 23:07:28
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v2 of 7 in this series.
Revisions (7)
A previous commit disabled the check to see if the untracked cache ident field was matching the current environment. So this field is now useless and we can remove some related code. We don't remove the ident field from "struct untracked_cache" as it would break compatibility with old indexes that already have an untracked cache with this field. Signed-off-by: Christian Couder <redacted> --- dir.c | 38 +++++--------------------------------- dir.h | 2 +- 2 files changed, 6 insertions(+), 34 deletions(-)
diff --git a/dir.c b/dir.c
index 0b07ba7..94fba2a 100644
--- a/dir.c
+++ b/dir.c@@ -1904,36 +1904,13 @@ static int treat_leading_path(struct dir_struct *dir, return rc; } -static const char *get_ident_string(void) -{ - static struct strbuf sb = STRBUF_INIT; - struct utsname uts; - - if (sb.len) - return sb.buf; - if (uname(&uts) < 0) - die_errno(_("failed to get kernel name and information")); - strbuf_addf(&sb, "Location %s, system %s %s %s", get_git_work_tree(), - uts.sysname, uts.release, uts.version); - return sb.buf; -} - -static int ident_in_untracked(const struct untracked_cache *uc) -{ - const char *end = uc->ident.buf + uc->ident.len; - const char *p = uc->ident.buf; - - for (p = uc->ident.buf; p < end; p += strlen(p) + 1) - if (!strcmp(p, get_ident_string())) - return 1; - return 0; -} - +/* + * We used to save the location of the work tree and the kernel version, + * but it was not a good idea, so we now just save an empty string. + */ void add_untracked_ident(struct untracked_cache *uc) { - if (ident_in_untracked(uc)) - return; - strbuf_addstr(&uc->ident, get_ident_string()); + strbuf_addstr(&uc->ident, ""); /* this strbuf contains a list of strings, save NUL too */ strbuf_addch(&uc->ident, 0); }
@@ -2015,11 +1992,6 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d if (dir->exclude_list_group[EXC_CMDL].nr) return NULL; - if (use_untracked_cache != 1 && !ident_in_untracked(dir->untracked)) { - warning(_("Untracked cache is disabled on this system.")); - return NULL; - } - if (!dir->untracked->root) { const int len = sizeof(*dir->untracked->root); dir->untracked->root = xmalloc(len);
diff --git a/dir.h b/dir.h
index 3e5114d..1935b76 100644
--- a/dir.h
+++ b/dir.h@@ -127,7 +127,7 @@ struct untracked_cache { struct sha1_stat ss_info_exclude; struct sha1_stat ss_excludes_file; const char *exclude_per_dir; - struct strbuf ident; + struct strbuf ident; /* unused now */ /* * dir_struct#flags must match dir_flags or the untracked * cache is ignored.
--
2.6.3.479.g8eb29d4