From 28224c23597e5d4b405b87e4e3dc321fd2d2c4f6 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Wed, 31 Oct 2018 10:15:52 +0000 Subject: [PATCH] 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 Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- builtin/am.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); -- 2.40.0