mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jk/report-fail-to-read-objects-better'
* jk/report-fail-to-read-objects-better: open_sha1_file: report "most interesting" errno
This commit is contained in:
commit
9d1d882e9c
|
@ -1437,19 +1437,23 @@ static int open_sha1_file(const unsigned char *sha1)
|
|||
{
|
||||
int fd;
|
||||
struct alternate_object_database *alt;
|
||||
int most_interesting_errno;
|
||||
|
||||
fd = git_open_noatime(sha1_file_name(sha1));
|
||||
if (fd >= 0)
|
||||
return fd;
|
||||
most_interesting_errno = errno;
|
||||
|
||||
prepare_alt_odb();
|
||||
errno = ENOENT;
|
||||
for (alt = alt_odb_list; alt; alt = alt->next) {
|
||||
fill_sha1_path(alt->name, sha1);
|
||||
fd = git_open_noatime(alt->base);
|
||||
if (fd >= 0)
|
||||
return fd;
|
||||
if (most_interesting_errno == ENOENT)
|
||||
most_interesting_errno = errno;
|
||||
}
|
||||
errno = most_interesting_errno;
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue