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 could not figure > out how would one implement multiple signatures using the > trailers mechanism. > > 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"] > signoff = "Acked-by: Michael S. Tsirkin <m...@redhat.com>" > > [am "r"] > signoff = "Reviewed-by: Michael S. Tsirkin <m...@redhat.com>" > > [am "t"] > signoff = "Tested-by: Michael S. Tsirkin <m...@redhat.com>" > > and now: > git am -s art > adds all 3 signatures when applying the patch.
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 <m...@redhat.com>" --trailer "Reviewed-by: Michael S. Tsirkin <m...@redhat.com>" --trailer "Tested-by: Michael S. Tsirkin <m...@redhat.com>" 0001-foo.patch >to_apply/0001-foo.patch and then: $ git am to_apply/*.patch Also by using something like: $ git config trailer.a.key Acked-by $ git config trailer.r.key Reviewed-by $ git config trailer.t.key Tested-by the first command could be simplified to: $ git interpret-trailers --trailer "a: Michael S. Tsirkin <m...@redhat.com>" --trailer "r: Michael S. Tsirkin <m...@redhat.com>" --trailer "t: Michael S. Tsirkin <m...@redhat.com>" 0001-foo.patch >to_apply/0001-foo.patch And if you use an env variable: $ ME="Michael S. Tsirkin <m...@redhat.com>" $ git interpret-trailers --trailer "a: $ME" --trailer "r: $ME" --trailer "t: $ME" 0001-foo.patch >to_apply/0001-foo.patch Maybe later we will integrate git interpret-trailers with git commit, git am and other commands, so that you can do directly: git am --trailer "a: $ME" --trailer "r: $ME" --trailer "t: $ME" 0001-foo.patch Maybe we wil also assign a one letter shortcut to --trailer, for example "z", so that could be: git am -z "a: $ME" -z "r: $ME" -z "t: $ME" 0001-foo.patch We could also allow many separators in the same -z argument as long as they are separated by say "~", so you could have: git am -z "a: $ME~r: $ME~t: $ME" 0001-foo.patch And then we could also allow people to define default values for trailers with something like: $ git config trailer.a.defaultvalue "Michael S. Tsirkin <m...@redhat.com>" $ git config trailer.r.defaultvalue "Michael S. Tsirkin <m...@redhat.com>" $ git config trailer.t.defaultvalue "Michael S. Tsirkin <m...@redhat.com>" So that in the end you could have: git am -z a~r~t 0001-foo.patch which is very close to "git am -s art". Best, Christian. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
