From dff6f280dff2b1d0d379ed0e73058819702d0f07 Mon Sep 17 00:00:00 2001 From: Clemens Buchacher Date: Tue, 4 Aug 2015 10:24:29 +0200 Subject: [PATCH] git_open_noatime: return with errno=0 on success In read_sha1_file_extended we die if read_object fails with a fatal error. We detect a fatal error if errno is non-zero and is not ENOENT. If the object could not be read because it does not exist, this is not considered a fatal error and we want to return NULL. Somewhere down the line, read_object calls git_open_noatime to open a pack index file, for example. We first try open with O_NOATIME. If O_NOATIME fails with EPERM, we retry without O_NOATIME. When the second open succeeds, errno is however still set to EPERM from the first attempt. When we finally determine that the object does not exist, read_object returns NULL and read_sha1_file_extended dies with a fatal error: fatal: failed to read object : Operation not permitted Fix this by resetting errno to zero before we call open again. Cc: Linus Torvalds Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano --- sha1_file.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sha1_file.c b/sha1_file.c index d7f1838c13..3502dcf666 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1446,7 +1446,10 @@ int git_open_noatime(const char *name) static int sha1_file_open_flag = O_NOATIME; for (;;) { - int fd = open(name, O_RDONLY | sha1_file_open_flag); + int fd; + + errno = 0; + fd = open(name, O_RDONLY | sha1_file_open_flag); if (fd >= 0) return fd; -- 2.11.4.GIT