From: Brad King <brad.king@kitware.com>
Date: Fri, 24 Jan 2014 19:45:58 GMT
Subject: Re: [PATCH/RFC 3/3] merge-recursive: Tolerate missing file when HEAD is up to date
Message-ID: <52E2C2F6.2030909@kitware.com>
In-Reply-To: <CABPp-BEK9+_ebRiodCp59DHJZExYn3N1jjtBsikSmwt-s_v_0A@mail.gmail.com>

On 01/24/2014 01:42 PM, Elijah Newren wrote:
> While this change does work for the particular new testcase you provided,
> there's a more complex case where merge-recursive is failing

I'm not surprised.  The change felt much like covering a symptom.

> it's just that we want the stat information refreshed if and only
> if the file happens to exist in the working tree.

We can add a refresh_flags argument to make_cache_entry to request
this behavior.  I'll send an updated series soon.

Thanks,
-Brad