From: Brad King Date: Fri, 24 Jan 2014 20:02:34 GMT Subject: Re: [PATCH/RFC 3/3] merge-recursive: Tolerate missing file when HEAD is up to date Message-ID: In-Reply-To: On Fri, Jan 24, 2014 at 2:50 PM, Junio C Hamano wrote: > It somehow feels wrong to force callers of make_cache_entry() to be > so intimate with the implementation details of refresh_cache_ent() [snip] > option bit CE_MATCH_MISSING_OK that asks it to treat a path that is > missing from the working tree as if it is checked out unmodified. I came to the same conclusion after reading Elijah's last response. My next series revision adds an argument to make_cache_entry to specify the refresh flags and honors REFRESH_IGNORE_MISSING. Thanks, -Brad