Re: [PATCH v3 07/11] dir: add new_untracked_cache()

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Dec 23, 2015, 22:53 UTC
Message-ID: <CAPig+cQoho_EAjvS2z5Wa3jV2zd_bMzdZRP5PFyruqB=cXGigw@mail.gmail.com>
In-Reply-To: <1450904639-25592-8-git-send-email-chriscool@tuxfamily.org>

On Wed, Dec 23, 2015 at 4:03 PM, Christian Couder <christian.couder@gmail.com> wrote:

>     Factor out code into new_untracked_cache(), which will be used
>     multiple times in a later commit.

Odd indentation: s/^\s+//

Show 16 quoted lines

> Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
> ---
> diff --git a/dir.c b/dir.c
> @@ -1938,16 +1938,20 @@ void add_untracked_ident(struct untracked_cache *uc)
>         strbuf_addch(&uc->ident, 0);
>  }
>
> +static void new_untracked_cache(void)
> +{
> +       struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
> +       strbuf_init(&uc->ident, 100);
> +       uc->exclude_per_dir = ".gitignore";
> +       /* should be the same flags used by git-status */
> +       uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
> +       the_index.untracked = uc;
> +}

This and the previous patch both move the same code around. As a reviewer, I could easily see the two patches combined, and would not find the unified patch onerous to review.

Show 17 quoted lines

>  void add_untracked_cache(void)
>  {
> -       if (!the_index.untracked) {
> -               struct untracked_cache *uc = xcalloc(1, sizeof(*uc));
> -               strbuf_init(&uc->ident, 100);
> -               uc->exclude_per_dir = ".gitignore";
> -               /* should be the same flags used by git-status */
> -               uc->dir_flags = DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
> -               the_index.untracked = uc;
> -       }
> +       if (!the_index.untracked)
> +               new_untracked_cache();
>         add_untracked_ident(the_index.untracked);
>         the_index.cache_changed |= UNTRACKED_CHANGED;
>  }
> --
> 2.7.0.rc2.11.g68ccdd4