summaryrefslogtreecommitdiff
path: root/entry.c
diff options
context:
space:
mode:
authorLars Schneider <larsxschneider@gmail.com>2017-10-05 12:44:07 +0200
committerJunio C Hamano <gitster@pobox.com>2017-10-06 14:59:16 +0900
commit11179eb31178d3d162e1b0af50edbdc2a14da23b (patch)
treed2df37bd44bfe6aa4519a17e982f51afacdd662c /entry.c
parent03b95333db32ea92b8a4a61f2f055a900f8d7c84 (diff)
downloadgit-11179eb31178d3d162e1b0af50edbdc2a14da23b.tar.gz
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>
Diffstat (limited to 'entry.c')
-rw-r--r--entry.c4
1 files changed, 3 insertions, 1 deletions
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;