From: Junio C Hamano <gitster@pobox•com>
To: Christian Couder <christian.couder@gmail•com>
Cc: git@vger•kernel.org, "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: Re: [PATCH 6/8] dir: add remove_untracked_cache()
Date: Tue, 08 Dec 2015 11:15:23 -0800 [thread overview]
Message-ID: <xmqqwpsokb04.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <1449594916-21167-7-git-send-email-chriscool@tuxfamily.org> (Christian Couder's message of "Tue, 8 Dec 2015 18:15:14 +0100")
Christian Couder <christian.couder@gmail•com> writes:
> This new function will be used in a later patch.
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily•org>
> ---
Up to this step I looked at and they made sense (I am not saying the
remainder of the series do not make sense).
I however wonder where the memory used for untracked cache goes when
this is called?
> builtin/update-index.c | 3 +--
> dir.c | 6 ++++++
> dir.h | 1 +
> 3 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index 40530b0..e427657 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -1126,8 +1126,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
> add_untracked_cache();
> fprintf(stderr, _("Untracked cache enabled for '%s'\n"), get_git_work_tree());
> } else if (untracked_cache == NO_UC && the_index.untracked) {
> - the_index.untracked = NULL;
> - the_index.cache_changed |= UNTRACKED_CHANGED;
> + remove_untracked_cache();
> fprintf(stderr, _("Untracked cache disabled\n"));
> }
>
> diff --git a/dir.c b/dir.c
> index 0f7e293..ffc0286 100644
> --- a/dir.c
> +++ b/dir.c
> @@ -1952,6 +1952,12 @@ void add_untracked_cache(void)
> the_index.cache_changed |= UNTRACKED_CHANGED;
> }
>
> +void remove_untracked_cache(void)
> +{
> + 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
next prev parent reply other threads:[~2015-12-08 19:15 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-08 17:15 [PATCH 0/8] Untracked cache improvements Christian Couder
2015-12-08 17:15 ` [PATCH 1/8] update-index: add untracked cache notifications Christian Couder
2015-12-08 19:03 ` Junio C Hamano
2015-12-11 8:51 ` Christian Couder
2015-12-08 17:15 ` [PATCH 2/8] update-index: use enum for untracked cache options Christian Couder
2015-12-08 19:11 ` Junio C Hamano
2015-12-10 10:37 ` Christian Couder
2015-12-10 18:46 ` Junio C Hamano
2015-12-11 9:10 ` Christian Couder
2015-12-11 17:44 ` Junio C Hamano
2015-12-12 9:25 ` Christian Couder
2015-12-08 17:15 ` [PATCH 3/8] update-index: add --test-untracked-cache Christian Couder
2015-12-08 17:15 ` [PATCH 4/8] update-index: move 'uc' var declaration Christian Couder
2015-12-08 17:15 ` [PATCH 5/8] dir: add add_untracked_cache() Christian Couder
2015-12-09 7:37 ` Torsten Bögershausen
2015-12-11 8:54 ` Christian Couder
2015-12-08 17:15 ` [PATCH 6/8] dir: add remove_untracked_cache() Christian Couder
2015-12-08 19:15 ` Junio C Hamano [this message]
2015-12-09 7:39 ` Torsten Bögershausen
2015-12-08 17:15 ` [PATCH 7/8] config: add core.untrackedCache Christian Couder
2015-12-08 19:28 ` Junio C Hamano
2015-12-08 22:43 ` Junio C Hamano
2015-12-14 12:18 ` Christian Couder
2015-12-14 19:44 ` Junio C Hamano
2015-12-14 21:30 ` Junio C Hamano
2015-12-15 9:34 ` Christian Couder
2015-12-15 9:49 ` Torsten Bögershausen
2015-12-15 16:42 ` Christian Couder
2015-12-15 10:02 ` Duy Nguyen
2015-12-15 16:35 ` Christian Couder
2015-12-15 13:04 ` Ævar Arnfjörð Bjarmason
2015-12-15 13:42 ` Christian Couder
2015-12-15 19:40 ` Junio C Hamano
2015-12-15 21:53 ` Ævar Arnfjörð Bjarmason
2015-12-15 23:03 ` Junio C Hamano
2015-12-16 1:10 ` Ævar Arnfjörð Bjarmason
2015-12-16 2:46 ` Jeff King
2015-12-16 5:20 ` Junio C Hamano
2015-12-16 6:05 ` Junio C Hamano
2015-12-17 7:44 ` Jeff King
2015-12-17 12:26 ` Duy Nguyen
[not found] ` <CAP8UFD0S_rWKjWiq_enkN+QVtvnq9fuwAxuuVTXTxu-F1mw4dg@mail.gmail.com>
2015-12-18 22:40 ` Fwd: " Christian Couder
2015-12-21 18:30 ` Junio C Hamano
2015-12-22 8:27 ` Duy Nguyen
2015-12-22 16:33 ` Junio C Hamano
2015-12-24 1:56 ` Junio C Hamano
2015-12-24 9:49 ` Duy Nguyen
2015-12-27 20:21 ` Junio C Hamano
2015-12-24 20:54 ` Christian Couder
[not found] ` <CAP8UFD0LAQG+gQ5EhYYLjo5=tpW3_ah6GV-mgRbgTjjgNmdorA@mail.gmail.com>
2015-12-18 22:38 ` Fwd: " Christian Couder
2015-12-17 12:36 ` Duy Nguyen
2015-12-18 23:24 ` Christian Couder
2015-12-09 13:19 ` Torsten Bögershausen
2015-12-08 17:15 ` [PATCH 8/8] t7063: add tests for core.untrackedCache Christian Couder
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=xmqqwpsokb04.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=christian.couder@gmail$(echo .)com \
--cc=dturner@twopensource$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=pclouds@gmail$(echo .)com \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
--cc=tboegi@web$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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