[PATCH v3 09/11] dir: simplify untracked cache "ident" field
- From
Christian Couder <christian.couder@gmail.com>
- Date
- Dec 23, 2015, 21:03 UTC
- Message-ID
- <1450904639-25592-10-git-send-email-chriscool@tuxfamily.org>
- In-Reply-To
- <1450904639-25592-1-git-send-email-chriscool@tuxfamily.org>
It is not a good idea to compare kernel versions and disable the untracked cache if it changes as people may upgrade and still want the untracked cache to work. So let's just compare work tree locations to decide if we should disable it.
Also it's not useful to store many locations in the ident field and compare to any of them. It can even be dangerous if GIT_WORK_TREE is used with different values. So let's just store one location, the location of the current work tree.
If this location changed and we still want an untracked cache, let's delete the cache and recreate it.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org> --- dir.c | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-)
diff --git a/dir.c b/dir.c index dba1ad0..7596a3f 100644 --- a/dir.c +++ b/dir.c @@ -1918,23 +1918,36 @@ static const char *get_ident_string(void) return sb.buf; } -static int ident_in_untracked(const struct untracked_cache *uc) +static int ident_current_location_in_untracked(const struct untracked_cache *uc) { - const char *end = uc->ident.buf + uc->ident.len; - const char *p = uc->ident.buf; + struct strbuf cur_loc = STRBUF_INIT; + int res = 0; - for (p = uc->ident.buf; p < end; p += strlen(p) + 1) - if (!strcmp(p, get_ident_string())) - return 1; - return 0; + /* + * Previous git versions may have saved many strings in the + * "ident" field, but it is insane to manage many locations, + * so just take care of the first one. + */ + + strbuf_addf(&cur_loc, "Location %s, system ", get_git_work_tree()); + + if (starts_with(uc->ident.buf, cur_loc.buf)) + res = 1; + + strbuf_release(&cur_loc); + + return res; } -void add_untracked_ident(struct untracked_cache *uc) +static void set_untracked_ident(struct untracked_cache *uc) { - if (ident_in_untracked(uc)) - return; + strbuf_reset(&uc->ident); strbuf_addstr(&uc->ident, get_ident_string()); - /* this strbuf contains a list of strings, save NUL too */ + + /* + * This strbuf used to contain a list of NUL separated + * strings, so save NUL too for backward compatibility. + */ strbuf_addch(&uc->ident, 0); } @@ -1945,15 +1958,21 @@ static void new_untracked_cache(void) uc->exclude_per_dir = ".gitignore"; /* should be the same flags used by git-status */ uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES; + set_untracked_ident(the_index.untracked); the_index.untracked = uc; + the_index.cache_changed |= UNTRACKED_CHANGED; } void add_untracked_cache(void) { - if (!the_index.untracked) + if (!the_index.untracked) { new_untracked_cache(); - add_untracked_ident(the_index.untracked); - the_index.cache_changed |= UNTRACKED_CHANGED; + } else { + if (!ident_current_location_in_untracked(the_index.untracked)) { + free_untracked_cache(the_index.untracked); + new_untracked_cache(); + } + } } void remove_untracked_cache(void) @@ -2021,7 +2040,7 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d if (dir->exclude_list_group[EXC_CMDL].nr) return NULL; - if (!ident_in_untracked(dir->untracked)) { + if (!ident_current_location_in_untracked(dir->untracked)) { warning(_("Untracked cache is disabled on this system.")); return NULL; }
-- 2.7.0.rc2.11.g68ccdd4