Move the appending of the commit message and origin information into its
own function, in preparation for a subsequent patch.
Signed-off-by: Jonathan Tan <jonathanta...@google.com>
---
sequencer.c | 46 ++++++++++++++++++++++++++++------------------
1 file changed, 28 insertions(+), 18 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index 3804fa9..b29c9ca 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -443,6 +443,33 @@ static int allow_empty(struct replay_opts *opts, struct
commit *commit)
return 1;
}
+/*
+ * Appends the commit log message, including the cherry picked notification if
+ * record_origin is nonzero.
+ */
+static void append_message(struct strbuf *msgbuf,
+ const struct commit_message *msg,
+ int record_origin,
+ const struct commit *commit)
+{
+ /*
+ * Append the commit log message to msgbuf; it starts
+ * after the tree, parent, author, committer
+ * information followed by "\n\n".
+ */
+ const char *p = strstr(msg->message, "\n\n");
+ if (p)
+ strbuf_addstr(msgbuf, skip_blank_lines(p + 2));
+
+ if (record_origin) {
+ if (!has_conforming_footer(msgbuf, NULL, 0))
+ strbuf_addch(msgbuf, '\n');
+ strbuf_addstr(msgbuf, cherry_picked_prefix);
+ strbuf_addstr(msgbuf, oid_to_hex(&commit->object.oid));
+ strbuf_addstr(msgbuf, ")\n");
+ }
+}
+
static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
{
unsigned char head[20];
@@ -534,29 +561,12 @@ static int do_pick_commit(struct commit *commit, struct
replay_opts *opts)
}
strbuf_addstr(&msgbuf, ".\n");
} else {
- const char *p;
-
base = parent;
base_label = msg.parent_label;
next = commit;
next_label = msg.label;
- /*
- * Append the commit log message to msgbuf; it starts
- * after the tree, parent, author, committer
- * information followed by "\n\n".
- */
- p = strstr(msg.message, "\n\n");
- if (p)
- strbuf_addstr(&msgbuf, skip_blank_lines(p + 2));
-
- if (opts->record_origin) {
- if (!has_conforming_footer(&msgbuf, NULL, 0))
- strbuf_addch(&msgbuf, '\n');
- strbuf_addstr(&msgbuf, cherry_picked_prefix);
- strbuf_addstr(&msgbuf, oid_to_hex(&commit->object.oid));
- strbuf_addstr(&msgbuf, ")\n");
- }
+ append_message(&msgbuf, &msg, opts->record_origin, commit);
}
if (!opts->strategy || !strcmp(opts->strategy, "recursive") ||
opts->action == REPLAY_REVERT) {
--
2.8.0.rc3.226.g39d4020
