Skip to content

Commit

Permalink
git_open_noatime: return with errno=0 on success
Browse files Browse the repository at this point in the history
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 <torvalds@linux-foundation.org>
Signed-off-by: Clemens Buchacher <clemens.buchacher@intel.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Clemens Buchacher authored and Junio C Hamano committed Aug 12, 2015
1 parent fdf96a2 commit dff6f28
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion sha1_file.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit dff6f28

Please sign in to comment.