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.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html