summaryrefslogtreecommitdiff
path: root/builtin/am.c
diff options
context:
space:
mode:
authorGiuseppe Bilotta <giuseppe.bilotta@gmail.com>2017-04-15 14:41:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-04-17 04:19:09 (GMT)
commitb7cc7051f7f1cf9092fbddc828ff4ec249373046 (patch)
tree4be423d3baa87be03fb229b17af4f5a4d0ac1319 /builtin/am.c
parentad36dc8b4b165bf9eb3576b42a241164e312d48c (diff)
downloadgit-b7cc7051f7f1cf9092fbddc828ff4ec249373046.zip
git-b7cc7051f7f1cf9092fbddc828ff4ec249373046.tar.gz
git-b7cc7051f7f1cf9092fbddc828ff4ec249373046.tar.bz2
builtin/am: honor --signoff also when --rebasing
Signoff is handled in parse_mail(), but not in parse_mail_rebasing(), since the latter is only used when git-rebase calls git-am with the --rebasing option, and --signoff is never passed in this case. In order to introduce (in the upcoming commits) support for `git-rebase --signoff`, we must make git-am pay attention to it also in the rebase case. This can be done by moving the conditional addition of the signoff from parse_mail() to the caller am_run(), after either of the parse_mail*() functions were called. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/am.c')
-rw-r--r--builtin/am.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/am.c b/builtin/am.c
index 826f18b..c92652d 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1321,9 +1321,6 @@ static int parse_mail(struct am_state *state, const char *mail)
strbuf_addbuf(&msg, &mi.log_message);
strbuf_stripspace(&msg, 0);
- if (state->signoff)
- am_signoff(&msg);
-
assert(!state->author_name);
state->author_name = strbuf_detach(&author_name, NULL);
@@ -1848,6 +1845,9 @@ static void am_run(struct am_state *state, int resume)
if (skip)
goto next; /* mail should be skipped */
+ if (state->signoff)
+ am_append_signoff(state);
+
write_author_script(state);
write_commit_msg(state);
}