[PATCH v1 2/2] entry.c: check if file exists after checkout
- From
lars.schneider@autodesk.com <lars.schneider@autodesk.com>
- Date
- Oct 5, 2017, 10:44 UTC
- Message-ID
- <20171005104407.65948-3-lars.schneider@autodesk.com>
- In-Reply-To
- <20171005104407.65948-1-lars.schneider@autodesk.com>
From: Lars Schneider <larsxschneider@gmail.com>
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> --- entry.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/entry.c b/entry.c index 5dab656364..2252d96756 100644 --- a/entry.c +++ b/entry.c @@ -355,7 +355,8 @@ 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("unable to get status of file %s", ce->name); fill_stat_cache_info(ce, &st); ce->ce_flags |= CE_UPDATE_IN_BASE; state->istate->cache_changed |= CE_ENTRY_CHANGED;
-- 2.14.2