From: Jeff King <peff@peff.net>
Date: Tue, 19 Sep 2017 19:41:10 +0000 (-0400)
Subject: read_info_alternates: warn on non-trivial errors
X-Git-Tag: v2.15.0-rc0~55^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f0f7bebef73346a12aa1e22cf5264cbc241ab069;p=git-core%2Fgit.git

read_info_alternates: warn on non-trivial errors

When we fail to open $GIT_DIR/info/alternates, we silently
assume there are no alternates. This is the right thing to
do for ENOENT, but not for other errors.

A hard error is probably overkill here. If we fail to read
an alternates file then either we'll complete our operation
anyway, or we'll fail to find some needed object. Either
way, a warning is good idea. And we already have a helper
function to handle this pattern; let's just call
warn_on_fopen_error().

Note that technically the errno from strbuf_read_file()
might be from a read() error, not open(). But since read()
would never return ENOENT or ENOTDIR, and since it produces
a generic "unable to access" error, it's suitable for
handling errors from either.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/sha1_file.c b/sha1_file.c
index a913865df..d65ca4324 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -456,6 +456,7 @@ static void read_info_alternates(const char * relative_base, int depth)
 
 	path = xstrfmt("%s/info/alternates", relative_base);
 	if (strbuf_read_file(&buf, path, 1024) < 0) {
+		warn_on_fopen_errors(path);
 		free(path);
 		return;
 	}