Merge branch 'mt/entry-fstat-fallback-fix' into master

"git checkout" failed to catch an error from fstat() after updating a path in the working tree. * mt/entry-fstat-fallback-fix: entry: check for fstat() errors after checkout
2020-07-09 14:00:45 -07:00 · 2020-07-09 14:00:45 -07:00 · d341042f71
commit d341042f71
parent 3ed0f1e3a1 35e6e212fd
1 changed files with 1 additions and 2 deletions
--- a/entry.c
+++ b/entry.c
@ -113,8 +113,7 @@ static int fstat_output(int fd, const struct checkout *state, struct stat *st)
 	/* use fstat() only when path == ce->name */
 	if (fstat_is_reliable() &&
 	    state->refresh_cache && !state->base_dir_len) {
-		fstat(fd, st);
-		return 1;
+		return !fstat(fd, st);
 	}
 	return 0;
 }