Browse Source

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>
maint
Phillip Wood 6 years ago committed by Junio C Hamano
parent
commit
28224c2359
  1. 3
      builtin/am.c

3
builtin/am.c

@ -318,7 +318,8 @@ static int read_author_script(struct am_state *state) @@ -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);

Loading…
Cancel
Save