On 01/23/2014 07:24 PM, Elijah Newren wrote: > Two options are just doing a stat to determine whether the file > is present (which means we'll be stat'ing the file multiple times > in these cases, which feels wasteful), or perhaps writing a > modified make_cache_entry() with the behavior we want > (seems like ugly code duplication). Suggestions? Perhaps we can thread enough information through the make_cache_entry signature to allow the caller to know when lstat reported ENOENT. Here is a series that takes such an approach. * Patch 1 is the original test case from $gmane/240853. * Patch 2 extends the make_cache_entry signature to return lstat errno. * Patch 3 uses this information to silence the add_cacheinfo diagnostic -Brad Brad King (3): t3030-merge-recursive: Test known breakage with empty work tree read-cache.c: Thread lstat error through make_cache_entry signature merge-recursive: Tolerate missing file when HEAD is up to date builtin/apply.c | 2 +- builtin/checkout.c | 2 +- builtin/reset.c | 2 +- cache.h | 2 +- merge-recursive.c | 22 ++++++++++++++-------- read-cache.c | 12 +++++++----- resolve-undo.c | 2 +- t/t3030-merge-recursive.sh | 47 ++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 73 insertions(+), 18 deletions(-) -- 1.8.5.2 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html