This is a repost after rebasing, and addressing comments by Eric Sunshine and
Fabian Ruch. I'd like to try getting this upstream so I can stop maintaining
it. So reposting - rebased to latest master, with a better motivation in the
cover letter.
As a maintainer, I get patches by mail, then
acked-by,reviewed-by etc responses are sent by separate
mail.
The result is that I have a patch applied, and now
I need to find it and apply the ack responses to it.
The flow I use to handle this, is to record an
empty commit (which I'm calling an ack commit)
with just the ack in the log, and ack! tag
and the subject of the original patch in the
subject.
Sometimes, I would also make a small change with
that ack commit, typically using commit --amend,
for example if the ack mail says:
Subject: Re: [PATCH] xyz
please rename xyz to foo. With that:
Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
I would apply ack and make the change as part of that.
Later, once in a while I rebase and squash the ack commits
into the regular one: the rebase autosquash mechanics
find the original commit and update the commit log,
appending the ack.
from example, we start with an email:
From: Michael S. Tsirkin <mst@xxxxxxxxxx>
Subject: [PATCH] foo.c: change b to c
Date: Wed Apr 6 22:07:34 2016 +0300
foo.c: change b to c
Change BBBBBBBBBBBBBBBBB to CCCCCCCCCCCCCCCCC
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
---
diff --git a/foo.c b/foo.c
index 8e5be91..34654fc 100644
--- a/foo.c
+++ b/foo.c
@@ -676,6 +676,6 @@ FFFFFFFFFFFFFFFFFFFFFFF(
AAAAAAAAAAAAAAAAAAAAAAAAA
- BBBBBBBBBBBBBBBBB
- BBBBBBBBBBBBBBBBB
+ CCCCCCCCCCCCCCCCC
+ CCCCCCCCCCCCCCCCC
DDDDDDDDDDDDDDDDD
and I apply it using git am.
then I get an email:
Subject: Re: [PATCH] foo.c: change b to c
> foo.c: change b to c
>
> Change BBBBBBBBBBBBBBBBB to CCCCCCCCCCCCCCCCC
>
> Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
>
> ---
>
> diff --git a/foo.c b/foo.c
> index 8e5be91..34654fc 100644
> --- a/foo.c
> +++ b/foo.c
> @@ -676,6 +676,6 @@ FFFFFFFFFFFFFFFFFFFFFFF(
> AAAAAAAAAAAAAAAAAAAAAAAAA
>
> - BBBBBBBBBBBBBBBBB
> - BBBBBBBBBBBBBBBBB
> + CCCCCCCCCCCCCCCCC
> + CCCCCCCCCCCCCCCCC
>
> DDDDDDDDDDDDDDDDD
Acked-by: Junio C Hamano <gitster@xxxxxxxxx>
I then create an empty commit using the subject and the ack line:
commit 4d54b237d8d03323933e27119272e93cf33b4e98
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Wed Apr 6 22:07:34 2016 +0300
ack! foo.c: change b to c
Acked-by: Junio C Hamano <gitster@xxxxxxxxx>
(with no change) and then after rebase -i --autosquash it is combined
with the original commit by squashing changes (easy as the
second one has an empty change), and appending the commit log
from the second one to first one:
commit ef7b6d457c28bcd06d0118a889c7070fc800f3d5
Author: Michael S. Tsirkin <mst@xxxxxxxxxx>
Date: Wed Apr 6 14:55:59 2016 +0300
foo.c: change b to c
Change BBBBBBBBBBBBBBBBB to CCCCCCCCCCCCCCCCC
Signed-off-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
Acked-by: Junio C Hamano <gitster@xxxxxxxxx>
diff --git a/foo.c b/foo.c
index 8e5be91..34654fc 100644
--- a/foo.c
+++ b/foo.c
@@ -676,6 +676,6 @@ FFFFFFFFFFFFFFFFFFFFFFF(
AAAAAAAAAAAAAAAAAAAAAAAAA
- BBBBBBBBBBBBBBBBB
- BBBBBBBBBBBBBBBBB
+ CCCCCCCCCCCCCCCCC
+ CCCCCCCCCCCCCCCCC
DDDDDDDDDDDDDDDDD
The empty ack commits can be created by hand. I have also
written a small script for that - included
as patch 4/4 but it is still rather rough so only putting it
under contrib for now - would like to try
and merge the rebase machinery in place first.
Long term, it might be cleaner to teach git-am about an --ack flag.
But it is already helpful to explain how this is intended to be used.
That script can be used in one of two ways:
1. pipe the mail with ack to it. we extract
subject and prepend ack!, extract the ack
trailer line that needs to be appended to commit,
and record the result as en empty commit.
2. pipe the mail with ack to it with flag -s,
this saves the ack trailer into a file.
then pipe the original patch(es) to it
with flag -r, now the subject is taken from
patch, with ack! prepended, but the ack trailer
is from the ack email.
this is useful to handle series acks, similar to:
For series:
Acked-by: Michael S. Tsirkin <mst@xxxxxxxxxx>
So what is an ack commit from point of view of rebase?
1. subject is ack! <original patch>
2. commit can be empty and it does not mean it needs to be skipped
3. when squashing into parent commit, subject and empty line
after it should be skipped, and the rest of commit log
should be appended to commit log of parent, as is.
I have been using these patches without any problems for more than a
year now, and find the approach very convenient.
Included:
rebase: new ack! action to handle ack commits
this part seems ready for merge to me,
please review and comment
git-ack: new tool to record an ack
this does not have proper documentation
and tests yet, I definitely intend to
do this but wanted to see whether people
like the UI first.
posting for early review and feedback
Note: people mostly using pull requests for communication
will not find this approach useful.
As it's optional, this should not be a problem.
Note: it was suggested that "squash! --noedit" would be easier
to maintain than "ack!" - I think this would be less
user-friendly, so I left this suggestion out for now.
Michael S. Tsirkin (4):
rebase -i: add ack action
git-rebase: document ack
rebase: test ack
git-ack: record an ack
Documentation/git-rebase.txt | 45 +++++++++++++++++++---
contrib/git-ack | 90 ++++++++++++++++++++++++++++++++++++++++++++
git-rebase--interactive.sh | 36 ++++++++++++++----
t/t3415-rebase-autosquash.sh | 15 ++++++++
4 files changed, 173 insertions(+), 13 deletions(-)
create mode 100755 contrib/git-ack
--
MST
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html