diff options
| author |  Phillip Wood <phillip.wood@dunelm.org.uk> | 2018-10-31 10:15:54 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-11-01 12:08:06 +0900 |
| commit | a75d35138850e3a171243c5fafce4efe75827e06 (patch) | |
| tree | 889178a3bb64111b5d41184a1b429b2bf222c836 | |
| parent | am: improve author-script error reporting (diff) | |
| download | tgif-a75d35138850e3a171243c5fafce4efe75827e06.tar.xz | |
am: rename read_author_script()
Rename read_author_script() in preparation for adding a shared
read_author_script() function to libgit.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/am.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/am.c b/builtin/am.c index ffca4479d7..c78a745289 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -306,7 +306,7 @@ static int parse_key_value_squoted(char *buf, struct string_list *list) * script, and thus if the file differs from what this function expects, it is * better to bail out than to do something that the user does not expect. */ -static int read_author_script(struct am_state *state) +static int read_am_author_script(struct am_state *state) { const char *filename = am_path(state, "author-script"); struct strbuf buf = STRBUF_INIT; @@ -441,7 +441,7 @@ static void am_load(struct am_state *state) BUG("state file 'last' does not exist"); state->last = strtol(sb.buf, NULL, 10); - if (read_author_script(state) < 0) + if (read_am_author_script(state) < 0) die(_("could not parse author script")); read_commit_msg(state); |