Re: [PATCH 6/8] dir: add remove_untracked_cache()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Dec 8, 2015, 19:15 UTC
- Message-ID
- <xmqqwpsokb04.fsf@gitster.mtv.corp.google.com>
- In-Reply-To
- <1449594916-21167-7-git-send-email-chriscool@tuxfamily.org>
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?
Show 46 quoted lines
> 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