From 11179eb31178d3d162e1b0af50edbdc2a14da23b Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Thu, 5 Oct 2017 12:44:07 +0200 Subject: [PATCH] entry.c: check if file exists after checkout If we are checking out a file and somebody else racily deletes our file, then we would write garbage to the cache entry. Fix that by checking the result of the lstat() call on that file. Print an error to the user if the file does not exist. Reported-by: Jeff King Signed-off-by: Lars Schneider Signed-off-by: Junio C Hamano --- entry.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/entry.c b/entry.c index f879758c73..ab79f1f69c 100644 --- a/entry.c +++ b/entry.c @@ -341,7 +341,9 @@ static int write_entry(struct cache_entry *ce, if (state->refresh_cache) { assert(state->istate); if (!fstat_done) - lstat(ce->name, &st); + if (lstat(ce->name, &st) < 0) + return error_errno("unable to stat just-written file %s", + ce->name); fill_stat_cache_info(ce, &st); ce->ce_flags |= CE_UPDATE_IN_BASE; state->istate->cache_changed |= CE_ENTRY_CHANGED;