Re: cover letter cc's [was: [PATCH 60/67] hw/s390x: add include directory headers]

On Fri, May 04, 2018 at 08:07:53AM -0500, Eric Blake wrote: > [adding a cross-post to the git mailing list] > > On 05/04/2018 02:10 AM, Cornelia Huck wrote: > > On Thu, 3 May 2018 22:51:40 +0300 > > "Michael S. Tsirkin" <m...@redhat.com> wrote: > > &

Re: storing cover letter of a patch series?

On Fri, Aug 05, 2016 at 08:39:58AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > On Thu, Sep 10, 2015 at 11:39:49AM -0700, Junio C Hamano wrote: > >> The problem with "empty commit trick" is that it is

Re: storing cover letter of a patch series?

On Thu, Sep 10, 2015 at 11:39:49AM -0700, Junio C Hamano wrote: > The problem with "empty commit trick" is that it is a commit whose > sole purpose is to describe the series, and its presence makes it > clear where the series ends, but the topology does not tell where > the series begins, so it is

Re: storing cover letter of a patch series?

On Thu, Sep 10, 2015 at 02:03:48PM -0700, Jacob Keller wrote: > On Thu, Sep 10, 2015 at 1:09 PM, Philip Oakley wrote: > > From: "Jacob Keller" > >> > >> On Thu, Sep 10, 2015 at 11:44 AM, Junio C Hamano > >> wrote: > >>> > >>>

[PATCH] git-fixup: automatically create a fixup commit

up the last commit that touched the file(s) affected by the fixup 2. look up the last commit that touched the line(s) affected by the fixup this implements the first heuristic. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- contrib/git-fixup | 8 1 file chan

Re: [PATCH 2/2] xdiff: implement empty line chunk heuristic

On Tue, Apr 19, 2016 at 04:07:35PM -0700, Junio C Hamano wrote: > Jacob Keller writes: > > > On Tue, Apr 19, 2016 at 10:06 AM, Jeff King wrote: > >> On Tue, Apr 19, 2016 at 08:17:38AM -0700, Stefan Beller wrote: > >> > >>> On Mon, Apr 18, 2016 at 10:03 PM,

Re: [PATCH 1/4] rebase -i: add ack action

On Tue, Apr 12, 2016 at 09:07:30AM -0700, Junio C Hamano wrote: > Matthieu Moy <matthieu@grenoble-inp.fr> writes: > > > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > >> Interesting. An empty commit would be rather easy to create on any

Re: [PATCH 1/4] rebase -i: add ack action

On Mon, Apr 11, 2016 at 10:03:39PM +0200, Matthieu Moy wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > On Mon, Apr 11, 2016 at 12:48:22PM -0700, Junio C Hamano wrote: > >> "Michael S. Tsirkin" <m...@redhat.com> writes: > >&g

Re: [PATCH 1/4] rebase -i: add ack action

On Mon, Apr 11, 2016 at 12:48:22PM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > Repost, sorry about the noise. > > > > On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote: > >> Hi Michael, &

Re: [PATCH 1/4] rebase -i: add ack action

Repost, sorry about the noise. On Mon, Apr 11, 2016 at 05:36:45PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On Mon, 11 Apr 2016, Michael S. Tsirkin wrote: > > > So far I only see examples of adding footers. If that's all we can think > > up, why cod

[no subject]

> > On Mon, 11 Apr 2016, Michael S. Tsirkin wrote: > > > So far I only see examples of adding footers. If that's all we can think > > up, why code in all this genericity? > > Because as far as I can see, the only benefitor of your patches would be > you. > > C

Re: [PATCH 1/4] rebase -i: add ack action

On Mon, Apr 11, 2016 at 01:02:07PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On Sun, 10 Apr 2016, Michael S. Tsirkin wrote: > > > This implements a new ack! action for git rebase -i > > It is essentially a middle ground between fixup! and squash!: > > -

Re: git interpret-trailers with multiple keys

On Mon, Apr 11, 2016 at 09:09:48AM +0200, Matthieu Moy wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > On Sun, Apr 10, 2016 at 06:57:53PM +0200, Christian Couder wrote: > >> What I meant is that we could create new options called maybe

Re: git interpret-trailers with multiple keys

On Sun, Apr 10, 2016 at 06:57:53PM +0200, Christian Couder wrote: > What I meant is that we could create new options called maybe > trailer.autocommands and trailer..autocommands that default to > 'true' and if 'false' the command would not be run automatically and > the corresponding trailer

Re: git interpret-trailers with multiple keys

On Sun, Apr 10, 2016 at 06:57:53PM +0200, Christian Couder wrote: > On Sun, Apr 10, 2016 at 11:32 AM, Michael S. Tsirkin <m...@redhat.com> wrote: > > On Wed, Apr 06, 2016 at 10:28:21PM -0400, Christian Couder wrote: > >> On Wed, Apr 6, 2016 at 3:30 PM, Michael S. Tsirkin

Re: git interpret-trailers with multiple keys

On Wed, Apr 06, 2016 at 10:28:21PM -0400, Christian Couder wrote: > On Wed, Apr 6, 2016 at 3:30 PM, Michael S. Tsirkin <m...@redhat.com> wrote: > > On Wed, Apr 06, 2016 at 10:42:42AM -0700, Junio C Hamano wrote: > >> "Michael S. Tsirkin" <m...@redhat.com>

Re: [PATCH 2/4] builtin/interpret-trailers: suppress blank line

On Thu, Apr 07, 2016 at 10:34:51AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > No - but then I will need to re-run mailinfo to parse the result, > > will I not? > > By the way, I suspect (if Christian did his impl

[PATCH 4/4] git-ack: record an ack

-by: Michael S. Tsirkin <m...@redhat.com> --- contrib/git-ack | 91 + 1 file changed, 91 insertions(+) create mode 100755 contrib/git-ack diff --git a/contrib/git-ack b/contrib/git-ack new file mode 100755 index 000..d8cba95 --- /de

[PATCH 1/4] rebase -i: add ack action

it rebase --autosquash -i origin/master before public branch push The "cat" command above is actually a script that parses the Ack mail to create the empty commit - to be submitted separately. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- git-re

[PATCH 0/4] support for ack commits

start with an email: From: Michael S. Tsirkin <m...@redhat.com> Subject: [PATCH] foo.c: change b to c Date: Wed Apr 6 22:07:34 2016 +0300 foo.c: change b to c Change B to C Signed-off

[PATCH 2/4] git-rebase: document ack

document ack! behaviour and use Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- Documentation/git-rebase.txt | 45 +++- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt

[PATCH 3/4] rebase: test ack

test ack! handling Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- t/t3415-rebase-autosquash.sh | 15 +++ 1 file changed, 15 insertions(+) diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 8f53e54..e78897d 100755 --- a/t/t3415-

Re: [PATCH] rebase: convert revert to squash on autosquash

On Fri, Apr 08, 2016 at 01:13:51PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote: > > > On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote: > > > > > > On Thu, 7 Apr 2016, Michael S. Tsirk

Re: [PATCH] rebase: convert revert to squash on autosquash

On Fri, Apr 08, 2016 at 01:42:12PM +0200, Matthieu Moy wrote: > Johannes Schindelin writes: > > > git revert -n deadbeef > > git commit --squash deadbeef > > > > where "deadbeef" is the placeholder for the actual commit to revert. > > > > And indeed, I use

Re: [PATCH] rebase: convert revert to squash on autosquash

On Fri, Apr 08, 2016 at 01:13:51PM +0200, Johannes Schindelin wrote: > Hi Michael, > > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote: > > > On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote: > > > > > > On Thu, 7 Apr 2016, Michael S. Tsirk

Re: [PATCH 1/4] builtin/interpret-trailers.c: allow -t

On Thu, Apr 07, 2016 at 10:30:02AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > On Thu, Apr 07, 2016 at 09:55:29AM -0700, Junio C Hamano wrote: > >> "Michael S. Tsirkin" <m...@redhat.com> write

Re: [PATCH 1/4] builtin/interpret-trailers.c: allow -t

On Thu, Apr 07, 2016 at 10:26:33AM -0700, Junio C Hamano wrote: > Matthieu Moy writes: > > >> I am in principle OK with the later step that teaches a single > >> letter option to end-user facing "git am" that would be turned into > >> "--trailer" when it calls out

Re: [PATCH 1/4] builtin/interpret-trailers.c: allow -t

On Thu, Apr 07, 2016 at 09:55:29AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > Allow -t as a short-cut for --trailer. > > > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> > > --- > > As

Re: [PATCH 2/4] builtin/interpret-trailers: suppress blank line

On Thu, Apr 07, 2016 at 10:00:37AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > it's sometimes useful to be able to pass output message of > > git-mailinfo through git-interpret-trailers, > > but that creates

Re: [PATCH 3/4] builtin/am: read mailinfo from file

On Thu, Apr 07, 2016 at 10:08:37AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > Slightly slower, but will allow easy additional processing on it. > > > > Signed-off-by: Michael S. Tsirkin <m...@redhat.com> >

Re: [PATCH] rebase: convert revert to squash on autosquash

On Thu, Apr 07, 2016 at 05:23:09PM +0200, Johannes Schindelin wrote: > Hi, > > On Thu, 7 Apr 2016, Michael S. Tsirkin wrote: > > > Reverts can typically be treated like squash. Eliminating both the > > original commit and the revert would be even nicer, but thi

[PATCH 4/4] builtin/am: passthrough -t and --trailer flags

Pass -t and --trailer flags to git-reinterpret-trailers. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- builtin/am.c | 48 1 file changed, 48 insertions(+) diff --git a/builtin/am.c b/builtin/am.c index 4180b04..480c4c2

[PATCH 3/4] builtin/am: read mailinfo from file

Slightly slower, but will allow easy additional processing on it. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- builtin/am.c | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/builtin/am.c b/builtin/am.c index d003939..4180b04 100644 --- a/builtin/am.c

[PATCH 1/4] builtin/interpret-trailers.c: allow -t

Allow -t as a short-cut for --trailer. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- builtin/interpret-trailers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c index b99ae4b..18cf640 100644 --- a/b

[PATCH 0/4] git-am: use trailers to add extra signatures

key = Tested-by command = "echo \"Michael S. Tsirkin <m...@redhat.com>\"" [trailer "r"] key = Reviewed-by command = "echo \"Michael S. Tsirkin <m...@redhat.com>\"" [trailer "a"] key = Acke

[PATCH 2/4] builtin/interpret-trailers: suppress blank line

-off-by: Michael S. Tsirkin <m...@redhat.com> --- trailer.h| 2 +- builtin/interpret-trailers.c | 9 +++-- trailer.c| 10 +++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/trailer.h b/trailer.h index 36b40b8..afcf680

[PATCH] rebase: convert revert to squash on autosquash

Reverts can typically be treated like squash. Eliminating both the original commit and the revert would be even nicer, but this seems a bit harder to implement. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- git-rebase--interactive.sh | 8 +++- 1 file changed, 7 insertions

Re: git interpret-trailers with multiple keys

On Wed, Apr 06, 2016 at 10:42:42AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > On Wed, Apr 06, 2016 at 06:58:30PM +0200, Matthieu Moy wrote: > >> "Michael S. Tsirkin" <m...@redhat.com> writes: > >

[PATCH] builtin/trailers: don't always run all commands

If an explicit -t trailer is used, only parse trailers from command line. Signed-off-by: Michael S. Tsirkin <m...@redhat.com> --- trailer.c | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/trailer.c b/trailer.c index 8e5be91..34654fc 100644 --- a/trailer.c

Re: git interpret-trailers with multiple keys

On Wed, Apr 06, 2016 at 06:58:30PM +0200, Matthieu Moy wrote: > "Michael S. Tsirkin" <m...@redhat.com> writes: > > > I have this in .git/config > > > > [trailer "r"] > > key = Reviewed-by > > command =

git interpret-trailers with multiple keys

I have this in .git/config [trailer "r"] key = Reviewed-by command = "echo \"Michael S. Tsirkin <m...@redhat.com\"" [trailer "s"] key = Signed-off-by command = "echo \"Michael S. Tsirkin <m...@redhat.

[PATCH] rebase: convert revert to squash on autosquash

Reverts can typically be treated like squash. Eliminating both the original commit and the revert would be even nicer, but this seems a bit harder to implement. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- git-rebase--interactive.sh | 8 +++- 1 file changed, 7 insertions(+), 1

Re: [PATCH RFC] git-am: support any number of signatures

On Tue, Sep 23, 2014 at 10:15:47AM -0700, Junio C Hamano wrote: Christian Couder christian.cou...@gmail.com writes: On Mon, Sep 22, 2014 at 4:01 PM, Michael S. Tsirkin m...@redhat.com wrote: ... As a reminder, this old patchset (that I replied to) enhanced git am -s with an option

Re: [PATCH RFC] git-am: support any number of signatures

On Wed, Sep 24, 2014 at 12:00:40PM +0200, Christian Couder wrote: On Tue, Sep 23, 2014 at 10:07 AM, Michael S. Tsirkin m...@redhat.com wrote: On Tue, Sep 23, 2014 at 09:45:50AM +0200, Christian Couder wrote: This is probably not as simple as you would like but it works with something like

Re: [PATCH RFC] git-am: support any number of signatures

On Tue, Sep 23, 2014 at 09:45:50AM +0200, Christian Couder wrote: Hi Michael, On Mon, Sep 22, 2014 at 4:01 PM, Michael S. Tsirkin m...@redhat.com wrote: Hi Junio, Christian, it's been a while. I see that the work on trailers is going on. I tried going over the documentation but I

Re: [PATCH RFC] git-am: support any number of signatures

On Wed, Jun 18, 2014 at 10:51:04AM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: On Tue, Jun 17, 2014 at 8:09 PM, Michael S. Tsirkin m...@redhat.com wrote: OK, after looking into this for a while, I realize this is a special property of the Signed-off-by footer

Re: autopacking twice?

On Sun, Jun 22, 2014 at 05:22:32PM +0200, Matthieu Moy wrote: Michael S. Tsirkin m...@redhat.com writes: Guess: auto-packing was started in background, did not complete in time, and was restarted for the second time? Probably once for fetch, and another after rebase. If true, some

autopacking twice?

I noticed this: remote: Counting objects: 302, done. remote: Compressing objects: 100% (195/195), done. remote: Total 209 (delta 169), reused 15 (delta 14) Receiving objects: 100% (209/209), 42.83 KiB | 0 bytes/s, done. Resolving deltas: 100% (169/169), completed with 67 local objects. From

Re: [PATCH RFC] git-am: support any number of signatures

On Tue, Jun 17, 2014 at 11:49:11PM -0700, Junio C Hamano wrote: On Tue, Jun 17, 2014 at 8:09 PM, Michael S. Tsirkin m...@redhat.com wrote: OK, after looking into this for a while, I realize this is a special property of the Signed-off-by footer. For now I think it's reasonable to just

Re: [PATCH RFC] git-am: support any number of signatures

On Wed, Jun 18, 2014 at 10:51:04AM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: On Tue, Jun 17, 2014 at 8:09 PM, Michael S. Tsirkin m...@redhat.com wrote: OK, after looking into this for a while, I realize this is a special property of the Signed-off-by footer

Re: [PATCH RFC] git-am: support any number of signatures

On Mon, Jun 16, 2014 at 11:06:20AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: Now A wants to sign this patch. I think there are two reasonable ways to behave: 1. What you describe above: A B A That is the only sensible thing to do for Signed-off

[PATCH RFC v2] git-am: support any number of signatures

: [am] signoff = Reviewed-by: Michael S. Tsirkin m...@redhat.com Will add reviewed by tag in addition to the S.O.B. if set all signatures are picked up when git am -s is used. 2. Any number of alternative signatures [am a] signoff = Acked-by: Michael S. Tsirkin m

Re: [PATCH RFC] git-am: support any number of signatures

On Fri, Jun 13, 2014 at 10:32:09AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: On Thu, Jun 12, 2014 at 12:07:03PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: ... 1. new parameter am.signoff can be used any number of times

Re: [PATCH RFC] git-am: support any number of signatures

On Thu, Jun 12, 2014 at 12:07:03PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: I'm using different signature tags for git am depending on the patch, project and other factors. Sometimes I add multiple tags as well, e.g. QEMU wants both Reviewed

Re: [PATCH RFC] git-am: support any number of signatures

On Thu, Jun 12, 2014 at 09:25:54PM +0200, René Scharfe wrote: Am 12.06.2014 18:12, schrieb Michael S. Tsirkin: @@ -136,7 +136,7 @@ fall_back_3way () { eval $cmd GIT_INDEX_FILE=$dotest/patch-merge-tmp-index \ git write-tree $dotest/patch-merge-base+ || -cannot_fallback

[PATCH RFC] git-am: support any number of signatures

: [am] signoff = Reviewed-by: Michael S. Tsirkin m...@redhat.com signoff = Signed-off-by: Michael S. Tsirkin m...@redhat.com if set all signatures are picked up when git am -s is used. 2. Any number of alternative signatures [am a] signoff = Acked-by: Michael S

Re: [PATCH 0/4] ack recoding in commit log

On Wed, Jun 11, 2014 at 10:05:46AM +0200, Fabian Ruch wrote: Hi Michael, On 05/18/2014 11:17 PM, Michael S. Tsirkin wrote: As a maintainer, I often get patches by mail, then acked-by,reviewed-by etc responses are sent by separate mail. I like making acks commits, this way

Re: 2.0.0 regression? request pull does not seem to find head

On Mon, Jun 02, 2014 at 02:36:01PM -0700, Linus Torvalds wrote: On Mon, Jun 2, 2014 at 2:01 PM, Michael S. Tsirkin m...@redhat.com wrote: [mst@robin linux]$ git request-pull net-next/master git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git net-next warn: No match for commit

2.0.0 regression? request pull does not seem to find head

up to 2ae76693b8bcabf370b981cd00c36cd41d33fabc: vhost: replace rcu with mutex (2014-06-02 23:47:59 +0300) Michael S. Tsirkin (2): vhost-net: extend device allocation to vmalloc vhost: replace rcu with mutex drivers

Re: 2.0.0 regression? request pull does not seem to find head

On Mon, Jun 02, 2014 at 02:27:25PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: Looks like pull requests no longer work for me on linux. Wasn't does not seem to find head was very much deliberate? I'm sorry I don't understand what you are asking here. Same thing

Re: [PATCH 3/4] rebase: test ack

On Tue, May 20, 2014 at 08:13:27AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: Just to clarify I can post v2 of 4/4 without reposting 1-3 since they are queued? If you need to update anything queued only on 'pu' but not yet in 'next', it is customary

Re: [PATCH 3/4] rebase: test ack

On Wed, May 21, 2014 at 09:54:47AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: On Tue, May 20, 2014 at 08:13:27AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: Just to clarify I can post v2 of 4/4 without reposting 1-3 since

Re: [PATCH 3/4] rebase: test ack

On Mon, May 19, 2014 at 02:34:26PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: test ack! handling Signed-off-by: Michael S. Tsirkin m...@redhat.com Will queue with this squashed in. 4/4 seems to have some style issues as well, but I didn't look very

format-patch crashes with a huge patchset

I tried to fump the whole history of qemu with format-patch. It crashes both with v2.0.0-rc2-21-g6087111 and with git 1.8.3.1: ~/opt/libexec/git-core/git-format-patch --follow -o patches/all e63c3dc74bfb90e4522d075d0d5a7600c5145745.. Backtrace: Program received signal SIGSEGV, Segmentation

Re: [PATCH 3/4] rebase: test ack

On Mon, May 19, 2014 at 02:34:26PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: test ack! handling Signed-off-by: Michael S. Tsirkin m...@redhat.com Will queue with this squashed in. Thanks! And sorry about the style issues. 4/4 seems to have some style

Re: [PATCH] request-pull: resurrect for-linus - tags/for-linus DWIM

/gmane.comp.emulators.qemu/273121 Signed-off-by: Junio C Hamano gits...@pobox.com Tested-by: Michael S. Tsirkin m...@redhat.com --- * I _think_ the fix, without breaking the spirit of Linus's I do not want the thing DWIM based on what the remote end has original, would be as simple as this patch

[PATCH] rebase --keep-empty -i: add test

There's some special code in rebase -i to deal with --keep-empty. Add test for this combination. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t3404-rebase-interactive.sh | 9 + 1 file changed, 9 insertions(+) diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase

[PATCH 2/4] git-rebase: document ack

document ack! behaviour and use Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-rebase.txt | 45 +++- 1 file changed, 40 insertions(+), 5 deletions(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index

[PATCH 3/4] rebase: test ack

test ack! handling Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t3415-rebase-autosquash.sh | 15 +++ 1 file changed, 15 insertions(+) diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh index 41370ab..9d7db13 100755 --- a/t/t3415-rebase-autosquash.sh

[PATCH 1/4] rebase -i: add ack action

--autosquash -i origin/master before public branch push The cat command above is actually a script that parses the Ack mail to create the empty commit - to be submitted separately. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- git-rebase--interactive.sh | 34

[PATCH 0/4] ack recoding in commit log

the UI first. posting for early review and feedback Note: yes, I think notes+git replace could be used for this too, my workflow always includes a rebase with --autosquash before publishing anyway, so dealing with ack as with any other commit is nicer. Michael S. Tsirkin (4

[PATCH 4/4] git-ack: record an ack

can create an empty commit recording the ack. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- contrib/git-ack | 84 + 1 file changed, 84 insertions(+) create mode 100755 contrib/git-ack diff --git a/contrib/git-ack b/contrib/git-ack

regression: request-pull with signed tag lacks tags/ in master

looks like pull requests with signed git got broken in git master: [mst@robin qemu]$ /usr/bin/git --version git version 1.8.3.1 [mst@robin qemu]$ git --version git version 2.0.0.rc1.18.gac53fc6.dirty [mst@robin qemu]$ [mst@robin qemu]$ /usr/bin/git request-pull origin/master

Re: regression: request-pull with signed tag lacks tags/ in master

On Thu, May 15, 2014 at 12:13:18PM -0700, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Michael S. Tsirkin m...@redhat.com writes: looks like pull requests with signed git got broken in git master: [mst@robin qemu]$ /usr/bin/git --version git version 1.8.3.1 [mst

Re: [PATCH] test doc: test_write_lines does not split its arguments

On Mon, May 05, 2014 at 04:51:43PM -0700, Jonathan Nieder wrote: test_write_lines carefully quotes its arguments as $@, so test_write_lines a b c writes two lines as requested, not three. Signed-off-by: Jonathan Nieder jrnie...@gmail.com Acked-by: Michael S. Tsirkin m

[PATCH v4 1/2] git-send-email: two new options: to-cover, cc-cover

Allow extracting To/Cc addresses from the first patch (typically the cover letter), and use them as To/Cc addresses of the remainder of the series. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-send-email.txt | 12 git-send-email.perl | 16

[PATCH v4 2/2] test/send-email: to-cover, cc-cover tests

Add tests for the new feature. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 45 + 1 file changed, 45 insertions(+) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 1ecdacb..97cc094 100755 --- a/t/t9001

Re: [PATCH v4 2/2] test/send-email: to-cover, cc-cover tests

On Tue, Apr 29, 2014 at 12:01:10PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: Add tests for the new feature. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 45 + 1 file changed

[PATCH v6 2/5] test: add test_write_lines helper

API and implementation as suggested by Junio. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/README| 22 ++ t/test-lib-functions.sh | 5 + 2 files changed, 27 insertions(+) diff --git a/t/README b/t/README index caeeb9d..2d6232f 100644 --- a/t

[PATCH v6 1/5] patch-id: make it stable against hunk reordering

, clarify that patch ID can now be a sum of hashes, not a hash. Document how command line and config options affect the behaviour. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- builtin/patch-id.c | 74 +- Documentation/git-patch-id.txt | 37

[PATCH v6 3/5] patch-id-test: test stable and unstable behaviour

Verify that patch ID supports an algorithm that is stable against diff split and reordering. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4204-patch-id.sh | 102 ++-- 1 file changed, 91 insertions(+), 11 deletions(-) diff --git a/t

[PATCH v6 4/5] patch-id: change default to stable

--stable has been the default in 'next' for a few weeks with no ill effects. Change the default to that so that users don't have to remember to enable it. Update documentation to match behaviour change. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- builtin/patch-id.c | 4

Re: [PATCH v5 5/9] patch-id: document new behaviour

On Thu, Apr 24, 2014 at 03:12:14PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: +--unstable:: +Use a non-symmetrical sum of hashes, such that reordering What is a non-symmetrical sum? Non-symmetrical combination function is better? I do

[PATCH v3 2/2] test/send-email: to-cover, cc-cover tests

Add tests for the new feature. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t9001-send-email.sh | 45 + 1 file changed, 45 insertions(+) diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh index 1ecdacb..97cc094 100755 --- a/t/t9001

[PATCH v3 1/2] git-send-email: two new options: to-cover, cc-cover

Allow extracting To/Cc addresses from cover letter. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-send-email.txt | 12 git-send-email.perl | 16 2 files changed, 28 insertions(+) diff --git a/Documentation/git-send-email.txt b

Re: [PATCH v2 1/2] git-send-email: two new options: to-cover, cc-cover

On Thu, Apr 03, 2014 at 11:31:51AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: Allow extracting To/Cc addresses from cover letter. Please say what you are doing with what you extract, which is the more important part of the objective. Extracting is merely

Re: [PATCH v4 4/6] patch-id: make it stable against hunk reordering

On Wed, Apr 23, 2014 at 03:05:42PM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: On Wed, Apr 23, 2014 at 10:39:23AM -0700, Junio C Hamano wrote: Are these three patches the same as what has been queued on mt/patch-id-stable topic and cooking in 'next' for a few

[PATCH v5 8/9] t4204-patch-id.sh: default is now stable

update test to match behaviour change Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4204-patch-id.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh index cd13e8e..03f91ce 100755 --- a/t/t4204-patch-id.sh +++ b/t/t4204

[PATCH v5 9/9] Documentation/git-patch-id.txt: default is stable

Update documentation to match behaviour change. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-patch-id.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index e21b79b..9299b90

[PATCH v5 5/9] patch-id: document new behaviour

Clarify that patch ID can now be a sum of hashes, not a hash. Document how command line and config options affect the behaviour. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- Documentation/git-patch-id.txt | 23 ++- 1 file changed, 18 insertions(+), 5 deletions

[PATCH v5 6/9] patch-id-test: test stable and unstable behaviour

Verify that patch ID supports an algorithm that is stable against diff split and reordering. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4204-patch-id.sh | 128 +++- 1 file changed, 117 insertions(+), 11 deletions(-) diff --git a/t

[PATCH v5 4/9] patch-id: make it stable against hunk reordering

places). The new behaviour is enabled - when patchid.stable is true - when --stable flag is present Using a new flag --unstable or setting patchid.stable to false force the historical behaviour. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- builtin/patch-id.c | 89

[PATCH v5 2/9] test: add test_write_lines helper

API and implementation as suggested by Junio. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/test-lib-functions.sh | 5 + 1 file changed, 5 insertions(+) diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh index aeae3ca..0e21275 100644 --- a/t/test-lib-functions.sh +++ b

[PATCH v5 7/9] patch-id: change default to stable

--stable has been the default in 'next' for a few weeks with no ill effects. Change the default to that so that users don't have to remember to enable it. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- builtin/patch-id.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[PATCH v5 1/9] diff: add a config option to control orderfile

I always want my diffs to show header files first, then .c files, then the rest. Make it possible to set orderfile though a config option to achieve this. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- diff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.c b/diff.c index

[PATCH v5 3/9] tests: new test for orderfile options

The test is very basic and can be extended. Couldn't find a good existing place to put it, so created a new file. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t/t4056-diff-order.sh | 63 +++ 1 file changed, 63 insertions(+) create mode

Re: [PATCH v5 5/9] patch-id: document new behaviour

On Thu, Apr 24, 2014 at 10:33:25AM -0700, Jonathan Nieder wrote: Michael S. Tsirkin wrote: Documentation/git-patch-id.txt | 23 ++- 1 file changed, 18 insertions(+), 5 deletions(-) Ah, there's the documentation. Please squash this with the patch that introduces

Re: [PATCH v5 4/9] patch-id: make it stable against hunk reordering

On Thu, Apr 24, 2014 at 10:30:44AM -0700, Jonathan Nieder wrote: Hi, Michael S. Tsirkin wrote: Patch id changes if users 1. reorder file diffs that make up a patch or 2. split a patch up to multiple diffs that touch the same path (keeping hunks within a single diff ordered to make

Re: [PATCH v5 3/9] tests: new test for orderfile options

On Thu, Apr 24, 2014 at 11:45:35AM -0700, Junio C Hamano wrote: Michael S. Tsirkin m...@redhat.com writes: The test is very basic and can be extended. Couldn't find a good existing place to put it, so created a new file. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- t

[PATCH v4 1/6] diff: add a config option to control orderfile

I always want my diffs to show header files first, then .c files, then the rest. Make it possible to set orderfile though a config option to achieve this. Signed-off-by: Michael S. Tsirkin m...@redhat.com --- diff.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/diff.c b/diff.c index

  1   2   3   >