Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
am: rename read_author_script()
author
Phillip Wood
<phillip.wood@dunelm.org.uk>
Wed, 31 Oct 2018 10:15:54 +0000
(10:15 +0000)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 1 Nov 2018 03:08:06 +0000
(12:08 +0900)
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>
builtin/am.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
442c36b
)
diff --git
a/builtin/am.c
b/builtin/am.c
index ffca4479d7b230b58d6ed25f3fcd282b2b3994d4..c78a745289fc16618d3739d1443c3fc6fef47be7 100644
(file)
--- 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.
*/
* 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_a
m_a
uthor_script(struct am_state *state)
{
const char *filename = am_path(state, "author-script");
struct strbuf buf = STRBUF_INIT;
{
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);
BUG("state file 'last' does not exist");
state->last = strtol(sb.buf, NULL, 10);
- if (read_author_script(state) < 0)
+ if (read_a
m_a
uthor_script(state) < 0)
die(_("could not parse author script"));
read_commit_msg(state);
die(_("could not parse author script"));
read_commit_msg(state);