mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gb/rebase-signoff'

Browse Source 
"git rebase" learns "--signoff" option.

* gb/rebase-signoff:
  rebase: pass --[no-]signoff option to git am
  builtin/am: fold am_signoff() into am_append_signoff()
  builtin/am: honor --signoff also when --rebasing
This commit is contained in:
Junio C Hamano
2017-04-26 15:39:01 +09:00
parent e2cb6ab84c 9f79524a6a
commit 768c7cb710
4 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
builtin/am.c
View File

@ -1185,42 +1185,39 @@ static void NORETURN die_user_resolve(const struct am_state *state)
exit(128);
}
static void am_signoff(struct strbuf *sb)
{
char *cp;
struct strbuf mine = STRBUF_INIT;
/* Does it end with our own sign-off? */
strbuf_addf(&mine, "\n%s%s\n",
sign_off_header,
fmt_name(getenv("GIT_COMMITTER_NAME"),
getenv("GIT_COMMITTER_EMAIL")));
if (mine.len < sb->len &&
!strcmp(mine.buf, sb->buf + sb->len - mine.len))
goto exit; /* no need to duplicate */
/* Does it have any Signed-off-by: in the text */
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;
}
strbuf_addstr(sb, mine.buf + !!cp);
exit:
strbuf_release(&mine);
}
/**
* Appends signoff to the "msg" field of the am_state.
*/
static void am_append_signoff(struct am_state *state)
{
char *cp;
struct strbuf mine = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT;
strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);
am_signoff(&sb);
/* our sign-off */
strbuf_addf(&mine, "\n%s%s\n",
sign_off_header,
fmt_name(getenv("GIT_COMMITTER_NAME"),
getenv("GIT_COMMITTER_EMAIL")));
/* Does sb end with it already? */
if (mine.len < sb.len &&
!strcmp(mine.buf, sb.buf + sb.len - mine.len))
goto exit; /* no need to duplicate */
/* Does it have any Signed-off-by: in the text */
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;
}
strbuf_addstr(&sb, mine.buf + !!cp);
exit:
strbuf_release(&mine);
state->msg = strbuf_detach(&sb, &state->msg_len);
}
@ -1325,9 +1322,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);
@ -1852,6 +1846,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);
}