Skip to content

Commit dff6f28

Browse files
Clemens Buchachergitster
authored andcommitted
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 <sha1>: Operation not permitted Fix this by resetting errno to zero before we call open again. Cc: Linus Torvalds <[email protected]> Signed-off-by: Clemens Buchacher <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent fdf96a2 commit dff6f28

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

sha1_file.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,10 @@ int git_open_noatime(const char *name)
14461446
static int sha1_file_open_flag = O_NOATIME;
14471447

14481448
for (;;) {
1449-
int fd = open(name, O_RDONLY | sha1_file_open_flag);
1449+
int fd;
1450+
1451+
errno = 0;
1452+
fd = open(name, O_RDONLY | sha1_file_open_flag);
14501453
if (fd >= 0)
14511454
return fd;
14521455

0 commit comments

Comments
 (0)