From: Eric Sunshine <sunshine@sunshineco.com>
Date: Wed, 30 Apr 2014 20:35:54 GMT
Subject: Re: [PATCH 18/32] read-cache: mark new entries for split index
Message-ID: <CAPig+cStwY3Evy8036Qetmz4Oz0t948=d9C3neBMsi6PbJjOGQ@mail.gmail.com>
In-Reply-To: <1398682553-11634-19-git-send-email-pclouds@gmail.com>

On Mon, Apr 28, 2014 at 6:55 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
> Make sure entry addition does not lead to unifying the index. We don't
> need to explicitly keep track of new entries. If ce->index is zero,
> they're new. Otherwise it's unlikely that they are new, but we'll do a
> through check later at writing time.

s/through/thorough/

> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  read-cache.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/read-cache.c b/read-cache.c
> index ff889ad..2f2e0c1 100644
> --- a/read-cache.c
> +++ b/read-cache.c
> @@ -38,7 +38,8 @@ static struct cache_entry *refresh_cache_entry(struct cache_entry *ce,
>  #define CACHE_EXT_LINK 0x6c696e6b        /* "link" */
>
>  /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
> -#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED)
> +#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
> +                CE_ENTRY_ADDED)
>
>  struct index_state the_index;
>  static const char *alternate_index_output;
> --
> 1.9.1.346.ga2b5940