Re: More builtin git-am issues..
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:06:27
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: More builtin git-am issues.. · Junio C Hamano <hidden>
- 2016-06-15 · Re: More builtin git-am issues.. · Christian Couder <hidden>
- 2016-06-15 · More builtin git-am issues.. · Linus Torvalds <torvalds@linux-foundation.org>
- 2016-06-15 · Re: More builtin git-am issues.. · Linus Torvalds <torvalds@linux-foundation.org>
- 2016-06-15 · Re: More builtin git-am issues.. · Jeff King <hidden>
Junio C Hamano [off-list ref] writes:
But for the purpose of 2.6-rc period, I think we should start from doing a separate implementation inside builtin/am.c without touching append_signoff(). ... Here is a quick attempt to do the "just fix am regression without changing anything else".
And a quick attempt without even compilation testing has flaws as expected X-<. Second attempt. builtin/am.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index 83b3d86..3a65d09 100644
--- a/builtin/am.c
+++ b/builtin/am.c@@ -1207,6 +1207,27 @@ static void NORETURN die_user_resolve(const struct am_state *state) exit(128); } +static void am_signoff(struct strbuf *sb) +{ + char *cp; + + strbuf_complete_line(sb); + + for (cp = sb->buf; + cp && *cp && (cp = strstr(cp, sign_off_header)) != NULL; + cp = strchr(cp, '\n')) { + if (sb->buf == cp || cp[-1] == '\n') + break; + } + if (!cp) + strbuf_addch(sb, '\n'); + strbuf_addf(sb, "%s%s\n", + sign_off_header, + fmt_name(getenv("GIT_COMMITTER_NAME"), + getenv("GIT_COMMITTER_EMAIL"))); + strbuf_addch(sb, '\n'); +} + /** * Appends signoff to the "msg" field of the am_state. */
@@ -1215,7 +1236,7 @@ static void am_append_signoff(struct am_state *state) struct strbuf sb = STRBUF_INIT; strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len); - append_signoff(&sb, 0, 0); + am_signoff(&sb); state->msg = strbuf_detach(&sb, &state->msg_len); }
@@ -1319,7 +1340,7 @@ static int parse_mail(struct am_state *state, const char *mail) stripspace(&msg, 0); if (state->signoff) - append_signoff(&msg, 0, 0); + am_signoff(&msg); assert(!state->author_name); state->author_name = strbuf_detach(&author_name, NULL);