Merge branch 'cb/open-noatime-clear-errno' into maint

When trying to see that an object does not exist, a state errno
leaked from our "first try to open a packfile with O_NOATIME and
then if it fails retry without it" logic on a system that refuses
O_NOATIME.  This confused us and caused us to die, saying that the
packfile is unreadable, when we should have just reported that the
object does not exist in that packfile to the caller.

* cb/open-noatime-clear-errno:
  git_open_noatime: return with errno=0 on success
This commit is contained in:
Junio C Hamano 2015-09-03 19:17:49 -07:00
commit cbcd3dcaa8

View File

@ -1461,7 +1461,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;