From: Christian Couder <christian.couder@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>, "Jeff King" <peff@peff.net>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"David Turner" <dturner@twopensource.com>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Torsten Bögershausen" <tboegi@web.de>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v5 07/11] dir: add remove_untracked_cache()
Date: Fri, 15 Jan 2016 07:59:48 +0100 [thread overview]
Message-ID: <1452841192-620-8-git-send-email-chriscool@tuxfamily.org> (raw)
In-Reply-To: <1452841192-620-1-git-send-email-chriscool@tuxfamily.org>
Factor out code into remove_untracked_cache(), which will be used
in a later commit.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
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 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
--
2.7.0.36.g20612a7
next prev parent reply other threads:[~2016-01-15 7:01 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-15 6:59 [PATCH v5 00/11] Untracked cache improvements Christian Couder
2016-01-15 6:59 ` [PATCH v5 01/11] dir: free untracked cache when removing it Christian Couder
2016-01-15 6:59 ` [PATCH v5 02/11] update-index: use enum for untracked cache options Christian Couder
2016-01-15 6:59 ` [PATCH v5 03/11] update-index: add --test-untracked-cache Christian Couder
2016-01-15 6:59 ` [PATCH v5 04/11] update-index: add untracked cache notifications Christian Couder
2016-01-15 6:59 ` [PATCH v5 05/11] update-index: move 'uc' var declaration Christian Couder
2016-01-15 6:59 ` [PATCH v5 06/11] dir: add {new,add}_untracked_cache() Christian Couder
2016-01-15 6:59 ` Christian Couder [this message]
2016-01-15 6:59 ` [PATCH v5 08/11] dir: simplify untracked cache "ident" field Christian Couder
2016-01-16 14:55 ` Torsten Bögershausen
2016-01-15 6:59 ` [PATCH v5 09/11] config: add core.untrackedCache Christian Couder
2016-01-15 20:15 ` Junio C Hamano
2016-01-15 6:59 ` [PATCH v5 10/11] test-dump-untracked-cache: don't modify the untracked cache Christian Couder
2016-01-15 20:16 ` Junio C Hamano
2016-01-20 10:12 ` Christian Couder
2016-01-15 6:59 ` [PATCH v5 11/11] t7063: add tests for core.untrackedCache Christian Couder
2016-01-15 20:16 ` [PATCH v5 00/11] Untracked cache improvements Junio C Hamano
2016-01-16 14:57 ` Torsten Bögershausen
2016-01-19 14:43 ` Christian Couder
2016-01-19 17:47 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1452841192-620-8-git-send-email-chriscool@tuxfamily.org \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=dturner@twopensource.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=tboegi@web.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).