[PATCH 06/15] commit.c: report error on failure to fopen() the graft file
- From
Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
- Date
- Apr 20, 2017, 11:26 UTC
- Message-ID
- <20170420112609.26089-7-pclouds@gmail.com>
- In-Reply-To
- <20170420112609.26089-1-pclouds@gmail.com>
Suppressing the error (because the command requires --quiet) is not a concern because we already call error() just a couple lines down.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> --- commit.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/commit.c b/commit.c index 73c78c2b80..8726225a7c 100644 --- a/commit.c +++ b/commit.c @@ -169,8 +169,11 @@ static int read_graft_file(const char *graft_file) { FILE *fp = fopen(graft_file, "r"); struct strbuf buf = STRBUF_INIT; - if (!fp) + if (!fp) { + if (errno != ENOENT) + warn_on_inaccessible(graft_file); return -1; + } while (!strbuf_getwholeline(&buf, fp, '\n')) { /* The format is just "Commit Parent1 Parent2 ...\n" */ struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
-- 2.11.0.157.gd943d85