* [PATCH v4 0/3] rebase: --signoff support
@ 2017-04-18 9:29 Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 1/3] builtin/am: obey --signoff also when --rebasing Giuseppe Bilotta
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Giuseppe Bilotta @ 2017-04-18 9:29 UTC (permalink / raw)
To: Git ML; +Cc: Junio C Hamano, Giuseppe Bilotta
Allow signing off a whole patchset by rebasing it with the `--signoff`
option, which is simply passed through to `git am`.
Changes since v3:
* --no-signoff is actually accepted;
* the paragraph documenting --signoff is now in the correct place and
it mentions explicitly that the option is not compatible with
interactive mode.
The patchset is also available in the git repository at:
git://git.oblomov.eu/git rebase-signoff
(Unrelated note: it just occurred to me while preparing this cover
letter that it would be nice if there was a way to combine `format-patch
--cover-letter` and `request-pull`.)
Some work about extending --signoff support to interactive rebases is
underway in the `rebase-signoff-ext` branch, but there's a lot of
corner cases to test and work-out, so I guess that'll be fore some
other time.
Giuseppe Bilotta (3):
builtin/am: obey --signoff also when --rebasing
builtin/am: fold am_signoff() into am_append_signoff()
rebase: pass --[no-]signoff option to git am
Documentation/git-rebase.txt | 5 +++++
builtin/am.c | 39 +++++++++++++++++--------------------
git-rebase.sh | 3 ++-
t/t3428-rebase-signoff.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 71 insertions(+), 22 deletions(-)
create mode 100755 t/t3428-rebase-signoff.sh
--
2.12.2.820.g78c033c3a1.dirty
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v4 1/3] builtin/am: obey --signoff also when --rebasing
2017-04-18 9:29 [PATCH v4 0/3] rebase: --signoff support Giuseppe Bilotta
@ 2017-04-18 9:29 ` Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 2/3] builtin/am: fold am_signoff() into am_append_signoff() Giuseppe Bilotta
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Giuseppe Bilotta @ 2017-04-18 9:29 UTC (permalink / raw)
To: Git ML; +Cc: Junio C Hamano, Giuseppe Bilotta
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 gi-am obey it also in the rebase case. This is
trivially fixed 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>
---
builtin/am.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index f7a7a971fb..d072027b5a 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);
}
--
2.12.2.820.g78c033c3a1.dirty
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v4 2/3] builtin/am: fold am_signoff() into am_append_signoff()
2017-04-18 9:29 [PATCH v4 0/3] rebase: --signoff support Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 1/3] builtin/am: obey --signoff also when --rebasing Giuseppe Bilotta
@ 2017-04-18 9:29 ` Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 3/3] rebase: pass --[no-]signoff option to git am Giuseppe Bilotta
2017-04-19 3:43 ` [PATCH v4 0/3] rebase: --signoff support Junio C Hamano
3 siblings, 0 replies; 5+ messages in thread
From: Giuseppe Bilotta @ 2017-04-18 9:29 UTC (permalink / raw)
To: Git ML; +Cc: Junio C Hamano, Giuseppe Bilotta
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>
---
builtin/am.c | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/builtin/am.c b/builtin/am.c
index d072027b5a..b29f885e41 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -1181,42 +1181,39 @@ static void NORETURN die_user_resolve(const struct am_state *state)
exit(128);
}
-static void am_signoff(struct strbuf *sb)
+/**
+ * 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;
- /* Does it end with our own sign-off? */
+ strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);
+
+ /* our 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))
+
+ /* 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;
+ for (cp = sb.buf;
cp && *cp && (cp = strstr(cp, sign_off_header)) != NULL;
cp = strchr(cp, '\n')) {
- if (sb->buf == cp || cp[-1] == '\n')
+ if (sb.buf == cp || cp[-1] == '\n')
break;
}
- strbuf_addstr(sb, mine.buf + !!cp);
+ 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)
-{
- struct strbuf sb = STRBUF_INIT;
-
- strbuf_attach(&sb, state->msg, state->msg_len, state->msg_len);
- am_signoff(&sb);
state->msg = strbuf_detach(&sb, &state->msg_len);
}
--
2.12.2.820.g78c033c3a1.dirty
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v4 3/3] rebase: pass --[no-]signoff option to git am
2017-04-18 9:29 [PATCH v4 0/3] rebase: --signoff support Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 1/3] builtin/am: obey --signoff also when --rebasing Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 2/3] builtin/am: fold am_signoff() into am_append_signoff() Giuseppe Bilotta
@ 2017-04-18 9:29 ` Giuseppe Bilotta
2017-04-19 3:43 ` [PATCH v4 0/3] rebase: --signoff support Junio C Hamano
3 siblings, 0 replies; 5+ messages in thread
From: Giuseppe Bilotta @ 2017-04-18 9:29 UTC (permalink / raw)
To: Git ML; +Cc: Junio C Hamano, Giuseppe Bilotta
This makes it easy to sign off a whole patchset before submission.
Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com>
---
Documentation/git-rebase.txt | 5 +++++
git-rebase.sh | 3 ++-
t/t3428-rebase-signoff.sh | 46 ++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 53 insertions(+), 1 deletion(-)
create mode 100755 t/t3428-rebase-signoff.sh
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 67d48e6883..53f4e14444 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -370,6 +370,11 @@ default is `--no-fork-point`, otherwise the default is `--fork-point`.
of the rebased commits (see linkgit:git-am[1]).
Incompatible with the --interactive option.
+--signoff::
+ This flag is passed to 'git am' to sign off all the rebased
+ commits (see linkgit:git-am[1]). Incompatible with the
+ --interactive option.
+
-i::
--interactive::
Make a list of the commits which are about to be rebased. Let the
diff --git a/git-rebase.sh b/git-rebase.sh
index 48d7c5ded4..db1deed846 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -34,6 +34,7 @@ root! rebase all reachable commits up to the root(s)
autosquash move commits that begin with squash!/fixup! under -i
committer-date-is-author-date! passed to 'git am'
ignore-date! passed to 'git am'
+signoff passed to 'git am'
whitespace=! passed to 'git apply'
ignore-whitespace! passed to 'git apply'
C=! passed to 'git apply'
@@ -321,7 +322,7 @@ do
--ignore-whitespace)
git_am_opt="$git_am_opt $1"
;;
- --committer-date-is-author-date|--ignore-date)
+ --committer-date-is-author-date|--ignore-date|--signoff|--no-signoff)
git_am_opt="$git_am_opt $1"
force_rebase=t
;;
diff --git a/t/t3428-rebase-signoff.sh b/t/t3428-rebase-signoff.sh
new file mode 100755
index 0000000000..2afb564701
--- /dev/null
+++ b/t/t3428-rebase-signoff.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+test_description='git rebase --signoff
+
+This test runs git rebase --signoff and make sure that it works.
+'
+
+. ./test-lib.sh
+
+# A simple file to commit
+cat >file <<EOF
+a
+EOF
+
+# Expected commit message after rebase --signoff
+cat >expected-signed <<EOF
+first
+
+Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
+EOF
+
+# Expected commit message after rebase without --signoff (or with --no-signoff)
+cat >expected-unsigned <<EOF
+first
+EOF
+
+
+# We configure an alias to do the rebase --signoff so that
+# on the next subtest we can show that --no-signoff overrides the alias
+test_expect_success 'rebase --signoff adds a sign-off line' '
+ git commit --allow-empty -m "Initial empty commit" &&
+ git add file && git commit -m first &&
+ git config alias.rbs "rebase --signoff" &&
+ git rbs HEAD^ &&
+ git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+ test_cmp expected-signed actual
+'
+
+test_expect_success 'rebase --no-signoff does not add a sign-off line' '
+ git commit --amend -m "first" &&
+ git rbs --no-signoff HEAD^ &&
+ git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+ test_cmp expected-unsigned actual
+'
+
+test_done
--
2.12.2.820.g78c033c3a1.dirty
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v4 0/3] rebase: --signoff support
2017-04-18 9:29 [PATCH v4 0/3] rebase: --signoff support Giuseppe Bilotta
` (2 preceding siblings ...)
2017-04-18 9:29 ` [PATCH v4 3/3] rebase: pass --[no-]signoff option to git am Giuseppe Bilotta
@ 2017-04-19 3:43 ` Junio C Hamano
3 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2017-04-19 3:43 UTC (permalink / raw)
To: Giuseppe Bilotta; +Cc: Git ML
Giuseppe Bilotta <giuseppe.bilotta@gmail.com> writes:
> Some work about extending --signoff support to interactive rebases is
> underway in the `rebase-signoff-ext` branch, but there's a lot of
> corner cases to test and work-out, so I guess that'll be fore some
> other time.
Yup, that is fine.
Will queue. Thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-04-19 3:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-18 9:29 [PATCH v4 0/3] rebase: --signoff support Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 1/3] builtin/am: obey --signoff also when --rebasing Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 2/3] builtin/am: fold am_signoff() into am_append_signoff() Giuseppe Bilotta
2017-04-18 9:29 ` [PATCH v4 3/3] rebase: pass --[no-]signoff option to git am Giuseppe Bilotta
2017-04-19 3:43 ` [PATCH v4 0/3] rebase: --signoff support Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.