From: Lars Schneider <larsxschneider@gmail.com>
Date: Thu, 5 Oct 2017 10:44:07 +0000 (+0200)
Subject: entry.c: check if file exists after checkout
X-Git-Tag: v2.15.0-rc1~1^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11179eb31178d3d162e1b0af50edbdc2a14da23b;p=thirdparty%2Fgit.git

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 <peff@peff.net>
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/entry.c b/entry.c
index f879758c73..ab79f1f69c 100644
--- a/entry.c
+++ b/entry.c
@@ -341,7 +341,9 @@ finish:
 	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;