kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

dir: add {new,add}_untracked_cache() 

Factor out code into new_untracked_cache() and
add_untracked_cache(), which will be used
in later commits.

Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Christian Couder 2016-01-24 16:28:19 +01:00 committed by Junio C Hamano
parent e7c0c5354b
commit 4a4ca4796d
3 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/update-index.c
View File

@ -1123,16 +1123,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
if (untracked_cache == UC_TEST) if (untracked_cache == UC_TEST)
return 0; return 0;
} }
if (!the_index.untracked) { add_untracked_cache(&the_index);
struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
strbuf_init(&uc->ident, 100);
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;
the_index.untracked = uc;
}
add_untracked_ident(the_index.untracked);
the_index.cache_changed |= UNTRACKED_CHANGED;
report(_("Untracked cache enabled for '%s'"), get_git_work_tree()); report(_("Untracked cache enabled for '%s'"), get_git_work_tree());
} else if (untracked_cache == UC_DISABLE) { } else if (untracked_cache == UC_DISABLE) {
if (the_index.untracked) { if (the_index.untracked) {

18
dir.c
View File

@ -1938,6 +1938,24 @@ void add_untracked_ident(struct untracked_cache *uc)
strbuf_addch(&uc->ident, 0); strbuf_addch(&uc->ident, 0);
} }


static void new_untracked_cache(struct index_state *istate)
{
struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
strbuf_init(&uc->ident, 100);
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;
istate->untracked = uc;
}

void add_untracked_cache(struct index_state *istate)
{
if (!istate->untracked) {
new_untracked_cache(istate);
add_untracked_ident(istate->untracked);
istate->cache_changed |= UNTRACKED_CHANGED;
}

static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir, static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir,
int base_len, int base_len,
const struct pathspec *pathspec) const struct pathspec *pathspec)

1
dir.h
View File

@ -308,4 +308,5 @@ void free_untracked_cache(struct untracked_cache *);
struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz); struct untracked_cache *read_untracked_extension(const void *data, unsigned long sz);
void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked); void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked);
void add_untracked_ident(struct untracked_cache *); void add_untracked_ident(struct untracked_cache *);
void add_untracked_cache(struct index_state *istate);
#endif #endif