From: Phillip Wood <phillip.wood@talktalk.net>
To: Junio C Hamano <gitster@pobox.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Git Mailing List <git@vger.kernel.org>,
Eric Sunshine <sunshine@sunshineco.com>,
Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: [PATCH 1/3] am: rename read_author_script()
Date: Wed, 12 Sep 2018 11:10:27 +0100
Message-ID: <20180912101029.28052-2-phillip.wood@talktalk.net> (raw)
In-Reply-To: <20180912101029.28052-1-phillip.wood@talktalk.net>
From: Phillip Wood <phillip.wood@dunelm.org.uk>
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>
---
builtin/am.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 5e866d17c7..8c165f747b 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -302,7 +302,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;
@@ -411,7 +411,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);
--
2.18.0
next prev parent reply index
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-12 10:10 [PATCH 0/3] am/rebase: share read_author_script() Phillip Wood
2018-09-12 10:10 ` Phillip Wood [this message]
2018-09-12 10:10 ` [PATCH 2/3] add read_author_script() to libgit Phillip Wood
2018-09-13 23:49 ` Eric Sunshine
2018-10-10 10:14 ` Phillip Wood
2018-10-10 10:22 ` Eric Sunshine
2018-09-12 10:10 ` [PATCH 3/3] sequencer: use read_author_script() Phillip Wood
2018-09-12 12:14 ` Eric Sunshine
2018-09-14 0:31 ` Eric Sunshine
2018-10-10 10:35 ` Phillip Wood
2018-10-18 10:00 ` [PATCH v2 0/5] am/rebase: share read_author_script() Phillip Wood
2018-10-18 10:00 ` [PATCH v2 1/5] am: don't die in read_author_script() Phillip Wood
2018-10-25 8:44 ` Junio C Hamano
2018-10-18 10:00 ` [PATCH v2 2/5] am: improve author-script error reporting Phillip Wood
2018-10-25 8:55 ` Junio C Hamano
2018-10-18 10:00 ` [PATCH v2 3/5] am: rename read_author_script() Phillip Wood
2018-10-18 10:00 ` [PATCH v2 4/5] add read_author_script() to libgit Phillip Wood
2018-10-18 10:00 ` [PATCH v2 5/5] sequencer: use read_author_script() Phillip Wood
2018-10-25 8:59 ` [PATCH v2 0/5] am/rebase: share read_author_script() Junio C Hamano
2018-10-26 9:00 ` Phillip Wood
2018-10-26 13:32 ` Junio C Hamano
2018-10-30 10:39 ` [PATCH v3 " Phillip Wood
2018-10-30 10:39 ` [PATCH v3 1/5] am: don't die in read_author_script() Phillip Wood
2018-10-30 10:39 ` [PATCH v3 2/5] am: improve author-script error reporting Phillip Wood
2018-10-30 10:39 ` [PATCH v3 3/5] am: rename read_author_script() Phillip Wood
2018-10-30 10:39 ` [PATCH v3 4/5] add read_author_script() to libgit Phillip Wood
2018-10-30 10:39 ` [PATCH v3 5/5] sequencer: use read_author_script() Phillip Wood
2018-10-31 2:50 ` [PATCH v3 0/5] am/rebase: share read_author_script() Junio C Hamano
2018-10-31 10:14 ` Phillip Wood
2018-10-31 10:15 ` [PATCH v4 " Phillip Wood
2018-10-31 10:15 ` [PATCH v4 1/5] am: don't die in read_author_script() Phillip Wood
2018-10-31 10:15 ` [PATCH v4 2/5] am: improve author-script error reporting Phillip Wood
2018-11-04 4:12 ` Eric Sunshine
2018-11-05 1:53 ` Junio C Hamano
2018-10-31 10:15 ` [PATCH v4 3/5] am: rename read_author_script() Phillip Wood
2018-10-31 10:15 ` [PATCH v4 4/5] add read_author_script() to libgit Phillip Wood
2018-10-31 10:15 ` [PATCH v4 5/5] sequencer: use read_author_script() Phillip Wood
2018-11-01 3:01 ` [PATCH v4 0/5] am/rebase: share read_author_script() Junio C Hamano
2018-11-01 3:12 ` [PATCH v4fixed 2/5] am: improve author-script error reporting Junio C Hamano
2018-11-01 3:12 ` [PATCH v4fixed 4/5] add read_author_script() to libgit Junio C Hamano
2018-11-01 16:27 ` [PATCH v4 0/5] am/rebase: share read_author_script() Phillip Wood
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180912101029.28052-2-phillip.wood@talktalk.net \
--to=phillip.wood@talktalk.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Mailing List Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/git/0 git/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 git git/ https://lore.kernel.org/git \
git@vger.kernel.org
public-inbox-index git
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.git
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git