From: Jonathan Nieder <hidden> Date: 2012-03-12 06:49:14
Hi,
(adding git list and Thomas to cc)
Willy Tarreau wrote:
On Sun, Mar 11, 2012 at 07:49:48PM -0700, Greg KH wrote:
quoted
On Mon, Mar 12, 2012 at 01:07:26AM +0000, Ben Hutchings wrote:
quoted
quoted
The subject/first line should include '[IA64]', as in the original
commit. It looks like this has been automatically stripped.
Yeah, munging patches to and from quilt and git will cause that to
happen at times, it's quite common :(
Indeed, and I've even changed my patch formats in haproxy to avoid brackets
due to this issue. The cause is that many patches are sent with a [PATCH]
prefix and that with Git, either you keep the subject line intact or you
remove everything that is between brackets. There's the -b option to only
remove remove tags looking like [PATCH], but my general experience with it
was not satisfying (I don't remind why).
Maybe the problem was as simple as "git am" not knowing about "-b".
Two relevant patches:
f7e5ea17 (am: learn passing -b to mailinfo, 2012-01-16)
ee2d1cb4 (mailinfo: with -b, keep space after [foo], 2012-01-16)
are in "master" and 1.7.10-rc0 and were not part of any earlier release.
Kudos to Thomas for writing them.
Jonathan
Hi Jonathan,
On Mon, Mar 12, 2012 at 01:48:55AM -0500, Jonathan Nieder wrote:
quoted
Indeed, and I've even changed my patch formats in haproxy to avoid brackets
due to this issue. The cause is that many patches are sent with a [PATCH]
prefix and that with Git, either you keep the subject line intact or you
remove everything that is between brackets. There's the -b option to only
remove remove tags looking like [PATCH], but my general experience with it
was not satisfying (I don't remind why).
Maybe the problem was as simple as "git am" not knowing about "-b".
I think you're quite right.
Two relevant patches:
f7e5ea17 (am: learn passing -b to mailinfo, 2012-01-16)
ee2d1cb4 (mailinfo: with -b, keep space after [foo], 2012-01-16)
are in "master" and 1.7.10-rc0 and were not part of any earlier release.
Kudos to Thomas for writing them.
Ah, thank you very much for this useful info, I'll update my version !
Cheers,
Willy
On Mon, Mar 12, 2012 at 09:58:20AM +0100, Willy Tarreau wrote:
Hi Jonathan,
On Mon, Mar 12, 2012 at 01:48:55AM -0500, Jonathan Nieder wrote:
quoted
quoted
Indeed, and I've even changed my patch formats in haproxy to avoid brackets
due to this issue. The cause is that many patches are sent with a [PATCH]
prefix and that with Git, either you keep the subject line intact or you
remove everything that is between brackets. There's the -b option to only
remove remove tags looking like [PATCH], but my general experience with it
was not satisfying (I don't remind why).
Maybe the problem was as simple as "git am" not knowing about "-b".
I think you're quite right.
quoted
Two relevant patches:
f7e5ea17 (am: learn passing -b to mailinfo, 2012-01-16)
ee2d1cb4 (mailinfo: with -b, keep space after [foo], 2012-01-16)
are in "master" and 1.7.10-rc0 and were not part of any earlier release.
Kudos to Thomas for writing them.
Ah, thank you very much for this useful info, I'll update my version !
I don't see a -b option to 'git am' in the manpage, am I missing
something here?
greg k-h
On Mon, Mar 12, 2012 at 08:20:04AM -0700, Greg KH wrote:
quoted
quoted
Two relevant patches:
f7e5ea17 (am: learn passing -b to mailinfo, 2012-01-16)
ee2d1cb4 (mailinfo: with -b, keep space after [foo], 2012-01-16)
are in "master" and 1.7.10-rc0 and were not part of any earlier release.
Kudos to Thomas for writing them.
Ah, thank you very much for this useful info, I'll update my version !
I don't see a -b option to 'git am' in the manpage, am I missing
something here?
It's in the master tree only right now, and the option is "--keep-non-patch"
(could have been shorter). Currently rebuilding to test it :-)
Willy