undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am: don't die in read_author_script()

Browse Source 
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>
This commit is contained in:
Phillip Wood 2018-10-31 10:15:52 +00:00 committed by Junio C Hamano
parent a4b8ab5363
commit 28224c2359
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
builtin/am.c
View File

@ -318,7 +318,8 @@ static int read_author_script(struct am_state *state)
if (fd < 0) { if (fd < 0) {
if (errno == ENOENT) if (errno == ENOENT)
return 0; 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); strbuf_read(&buf, fd, 0);
close(fd); close(fd);