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

2014-10-13 Thread Christian Couder
From: Junio C Hamano > > Christian Couder writes: > >> On Sun, Oct 12, 2014 at 11:36 AM, Christian Couder >> wrote: >>> >>> With v16 you can easily choose if you want to have the S-o-b in the >>> output or not, when there is already one, ... >> >> By the way, I sent v16 just before the above em

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

2014-10-13 Thread Junio C Hamano
Christian Couder writes: > On Sun, Oct 12, 2014 at 11:36 AM, Christian Couder > wrote: >> >> With v16 you can easily choose if you want to have the S-o-b in the >> output or not, when there is already one, ... > > By the way, I sent v16 just before the above email, but the series > still hasn't

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

2014-10-12 Thread Christian Couder
On Sun, Oct 12, 2014 at 11:36 AM, Christian Couder wrote: > > With v16 you can easily choose if you want to have the S-o-b in the > output or not, when there is already one, ... By the way, I sent v16 just before the above email, but the series still hasn't hit the mailing list. Did some of you g

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

2014-10-12 Thread Christian Couder
On Sun, Sep 28, 2014 at 9:32 PM, Junio C Hamano wrote: > Christian Couder writes: > >> From: Junio C Hamano >> >>> If that is what happens, it is not a workable workaround to set Sob to >>> addIfDifferent only for this invocation. >> >> Setting S-o-b to addIfDifferent for this invocation would n

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

2014-10-07 Thread Junio C Hamano
Jeff King writes: > Optional parameters for arguments make backwards-compatibility tricky. > In this case, the command: > > git am -s mbox1 mbox2 > > means "apply the patches from mbox1 and mbox2, and signoff the patches". > Under your scheme, it now means "apply from mbox2, and use the trailer

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

2014-10-07 Thread Jeff King
On Wed, Oct 08, 2014 at 12:29:37AM +0300, Michael S. Tsirkin wrote: > > If I understand it correctly, Michael is envisioning to implement > > his "git am -s art" (I would recommend against reusing -s for this, > > though. "git am --trailer art" is fine) and doing so by using > > interpret-trailer

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

2014-10-07 Thread Michael S. Tsirkin
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 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

2014-10-07 Thread Michael S. Tsirkin
On Tue, Sep 23, 2014 at 10:15:47AM -0700, Junio C Hamano wrote: > Christian Couder writes: > > > On Mon, Sep 22, 2014 at 4:01 PM, Michael S. Tsirkin wrote: > >> ... > >> As a reminder, this old patchset (that I replied to) enhanced git am -s > >> with an option to add different signatures depend

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

2014-09-28 Thread Christian Couder
From: Junio C Hamano > On Thu, Sep 25, 2014 at 3:04 AM, Christian Couder > wrote: >>> To an existing message ends with Michael's Signed-off-by:, if his >>> "git am --trailer arts" is called to add these three and then a >>> Signed-off-by: from him, should it add an extra S-o-b (because his >>> ex

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

2014-09-25 Thread Junio C Hamano
On Thu, Sep 25, 2014 at 3:04 AM, Christian Couder wrote: >> To an existing message ends with Michael's Signed-off-by:, if his >> "git am --trailer arts" is called to add these three and then a >> Signed-off-by: from him, should it add an extra S-o-b (because his >> existing S-o-b will no longer be

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

2014-09-25 Thread Christian Couder
On Tue, Sep 23, 2014 at 7:15 PM, Junio C Hamano wrote: > Christian Couder writes: > >> >> This is probably not as simple as you would like but it works with >> something like: >> >> $ git interpret-trailers --trailer "Acked-by: Michael S. Tsirkin >> " --trailer "Reviewed-by: Michael S. Tsirkin >>

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

2014-09-24 Thread Junio C Hamano
Junio C Hamano writes: > What would be more interesting is if the primitives you have, > e.g. "replace", "append", etc. are sufficient to express his use > case and similar ones. For example, when working on multiple > trailers (e.g. "am --trailer art" would muck with three kinds), how > should

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

2014-09-24 Thread Christian Couder
On Tue, Sep 23, 2014 at 10:07 AM, Michael S. Tsirkin 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: >> >> $ git interpret-trailers --trailer "Acked-by: Michael S. Tsirkin >> " --tra

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

2014-09-23 Thread Junio C Hamano
Christian Couder writes: > On Mon, Sep 22, 2014 at 4:01 PM, Michael S. Tsirkin wrote: >> ... >> As a reminder, this old patchset (that I replied to) enhanced git am -s >> with an option to add different signatures depending on >> the option passed to the -s flag. >> E.g. I have >> [am "a"] >>

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

2014-09-23 Thread Michael S. Tsirkin
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 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 could

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

2014-09-23 Thread Christian Couder
Hi Michael, On Mon, Sep 22, 2014 at 4:01 PM, Michael S. Tsirkin 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 could not figure > out how would one implement multiple signatures using the > trailers

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

2014-09-22 Thread Junio C Hamano
"Michael S. Tsirkin" writes: > 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 could not figure > out how would one implement multiple signatures using the > trailers mechanism. Good. Christian has been reroll

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

2014-09-22 Thread Michael S. Tsirkin
On Wed, Jun 18, 2014 at 10:51:04AM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > > On Tue, Jun 17, 2014 at 8:09 PM, Michael S. Tsirkin 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

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

2014-06-18 Thread Michael S. Tsirkin
On Wed, Jun 18, 2014 at 10:51:04AM -0700, Junio C Hamano wrote: > Junio C Hamano writes: > > > On Tue, Jun 17, 2014 at 8:09 PM, Michael S. Tsirkin 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

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

2014-06-18 Thread Junio C Hamano
Junio C Hamano writes: > On Tue, Jun 17, 2014 at 8:09 PM, Michael S. Tsirkin 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 avoid de-duplicating >> other footers if any. Agree?

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

2014-06-18 Thread Michael S. Tsirkin
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 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 avoid de-d

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

2014-06-17 Thread Junio C Hamano
On Tue, Jun 17, 2014 at 8:09 PM, Michael S. Tsirkin 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 avoid de-duplicating > other footers if any. Agree? Not really. I'd rather see "git

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

2014-06-17 Thread Michael S. Tsirkin
On Mon, Jun 16, 2014 at 11:06:20AM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" 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

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

2014-06-16 Thread Junio C Hamano
"Michael S. Tsirkin" 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-by footers. > 2. For things like Tested-by: tags, removing tag from > where it was a

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

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

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

2014-06-13 Thread Junio C Hamano
"Michael S. Tsirkin" writes: > On Thu, Jun 12, 2014 at 12:07:03PM -0700, Junio C Hamano wrote: >> "Michael S. Tsirkin" writes: >> ... >> > 1. new parameter am.signoff can be used any number >> >of times: >> > >> > [am] >> >signoff = "Reviewed-by: Michael S. Tsirkin " >> >signoff = "

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

2014-06-13 Thread Michael S. Tsirkin
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+" || > >-

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

2014-06-13 Thread Michael S. Tsirkin
On Thu, Jun 12, 2014 at 12:07:03PM -0700, Junio C Hamano wrote: > "Michael S. Tsirkin" 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-by and Signed-

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

2014-06-12 Thread René Scharfe
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 "$(gettext "Repository lacks necessary blobs to fall back

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

2014-06-12 Thread Junio C Hamano
"Michael S. Tsirkin" 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-by and Signed-off-by tags. > > This patch makes it easy to do so: > 1. new parameter am.sig