From: Phillip Wood <phillip.wood@dunelm.org.uk>
Date: Wed, 31 Oct 2018 10:15:52 +0000 (+0000)
Subject: am: don't die in read_author_script()
X-Git-Tag: v2.20.0-rc0~42^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28224c23597e5d4b405b87e4e3dc321fd2d2c4f6;p=git

am: don't die in read_author_script()

The caller is already prepared to handle errors returned from this
function so there is no need for it to die if it cannot read the file.

Suggested-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/am.c b/builtin/am.c
index 5e643e2a3e..4f7f28a9dc 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -318,7 +318,8 @@ static int read_author_script(struct am_state *state)
 	if (fd < 0) {
 		if (errno == ENOENT)
 			return 0;
-		die_errno(_("could not open '%s' for reading"), filename);
+		return error_errno(_("could not open '%s' for reading"),
+				   filename);
 	}
 	strbuf_read(&buf, fd, 0);
 	close(fd);