[PATCH v4 07/10] dir: add remove_untracked_cache()
flat view
STALE3772d
SUPERSEDED
From: Christian Couder <hidden>
Date: 2016-06-15 23:07:35
Subsystem:
the rest · Maintainer:
Linus Torvalds
Revision v4 of 9 in this series.
Revisions (9)
Factor out code into remove_untracked_cache(), which will be used in a later commit. Signed-off-by: Christian Couder <redacted> --- builtin/update-index.c | 6 +----- dir.c | 9 +++++++++ dir.h | 1 + 3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 74a6f8d..7844991 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c@@ -1126,11 +1126,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) add_untracked_cache(); report(_("Untracked cache enabled for '%s'"), get_git_work_tree()); } else if (untracked_cache == UC_DISABLE) { - if (the_index.untracked) { - free_untracked_cache(the_index.untracked); - the_index.untracked = NULL; - the_index.cache_changed |= UNTRACKED_CHANGED; - } + remove_untracked_cache(); report(_("Untracked cache disabled")); }
diff --git a/dir.c b/dir.c
index 4227ba6..dba1ad0 100644
--- a/dir.c
+++ b/dir.c@@ -1956,6 +1956,15 @@ void add_untracked_cache(void) the_index.cache_changed |= UNTRACKED_CHANGED; } +void remove_untracked_cache(void) +{ + if (the_index.untracked) { + free_untracked_cache(the_index.untracked); + the_index.untracked = NULL; + the_index.cache_changed |= UNTRACKED_CHANGED; + } +} + static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *dir, int base_len, const struct pathspec *pathspec)
diff --git a/dir.h b/dir.h
index ee94c76..3e5114d 100644
--- a/dir.h
+++ b/dir.h@@ -309,4 +309,5 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long void write_untracked_extension(struct strbuf *out, struct untracked_cache *untracked); void add_untracked_ident(struct untracked_cache *); void add_untracked_cache(void); +void remove_untracked_cache(void); #endif
--
2.7.0.rc2.10.g544ad6b