undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/am: fold am_signoff() into am_append_signoff()

Browse Source 
There are no more direct calls to am_signoff(), so we can fold its
logic  in am_append_signoff().

(This is done in a separate commit rather than in the previous one, to
make it easier to revert this specific change if additional calls are
ever introduced.)

Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Giuseppe Bilotta 2017-04-15 16:41:02 +02:00 committed by Junio C Hamano
parent b7cc7051f7
commit 0fb3c4fc9a
1 changed files with 25 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
builtin/am.c
View File

@ -1181,42 +1181,39 @@ static void NORETURN die_user_resolve(const struct am_state *state)
exit(128); 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. * Appends signoff to the "msg" field of the am_state.
*/ */
static void am_append_signoff(struct am_state *state) static void am_append_signoff(struct am_state *state)
{ {
char *cp;
struct strbuf mine = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT; struct strbuf sb = STRBUF_INIT;
strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len); 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); state->msg = strbuf_detach(&sb, &state->msg_len);
} }