summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Couder <christian.couder@gmail.com>2016-01-24 15:28:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-01-25 20:40:11 (GMT)
commit07b29bfd8d3de9a16c1c93e285b6980ca6b77b45 (patch)
treee63f874f30994dc539b63f0e680cc4c03080b963
parent4a4ca4796df6b81d5995f31e87e9e6a64c2b889d (diff)
downloadgit-07b29bfd8d3de9a16c1c93e285b6980ca6b77b45.zip
git-07b29bfd8d3de9a16c1c93e285b6980ca6b77b45.tar.gz
git-07b29bfd8d3de9a16c1c93e285b6980ca6b77b45.tar.bz2
dir: add remove_untracked_cache()
Factor out code into remove_untracked_cache(), which will be used in a later commit. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--builtin/update-index.c6
-rw-r--r--dir.c9
-rw-r--r--dir.h1
3 files changed, 11 insertions, 5 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 5f8630c..d90154c 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(&the_index);
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(&the_index);
report(_("Untracked cache disabled"));
}
diff --git a/dir.c b/dir.c
index 31eae37..0d069c9 100644
--- a/dir.c
+++ b/dir.c
@@ -1956,6 +1956,15 @@ void add_untracked_cache(struct index_state *istate)
istate->cache_changed |= UNTRACKED_CHANGED;
}
+void remove_untracked_cache(struct index_state *istate)
+{
+ if (istate->untracked) {
+ free_untracked_cache(istate->untracked);
+ istate->untracked = NULL;
+ istate->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 cfd3636..a3dacdb 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(struct index_state *istate);
+void remove_untracked_cache(struct index_state *istate);
#endif