commit <sha> upstream. vs git cherry-pick -x

commit <sha> upstream. vs git cherry-pick -x

[Nick Desaulniers]

Hello stable maintainers,
While working on some backports I'm about to send hopefully today or
tomorrow, I was curious why the convention seems to be for folks to
use "commit <sha> upstream." in commit messages?  I know that's what's
in https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-3,
but I was curious whether the format from `git cherry-pick -xs <sha>`
is not acceptable? I assume there's context as to why not?  It is nice
to have that info uniformly near the top, but I find myself having to
cherry-pick then amend a lot.  Or is there an option in git to
automate the stable kernel's preferred style?

-- 
Thanks,
~Nick Desaulniers

Re: commit <sha> upstream. vs git cherry-pick -x

[Sasha Levin]

On Wed, Mar 10, 2021 at 02:37:03PM -0800, Nick Desaulniers wrote:
>Hello stable maintainers,
>While working on some backports I'm about to send hopefully today or
>tomorrow, I was curious why the convention seems to be for folks to
>use "commit <sha> upstream." in commit messages?  I know that's what's
>in https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-3,
>but I was curious whether the format from `git cherry-pick -xs <sha>`
>is not acceptable? I assume there's context as to why not?  It is nice
>to have that info uniformly near the top, but I find myself having to
>cherry-pick then amend a lot.  Or is there an option in git to
>automate the stable kernel's preferred style?

AFAIK it's just due to historical reasons. Both the stable tree and git
added this "feature" at about the same time, each doing it slightly
differently.

-- 
Thanks,
Sasha

Re: commit <sha> upstream. vs git cherry-pick -x

[Greg KH]

On Wed, Mar 10, 2021 at 02:37:03PM -0800, Nick Desaulniers wrote:
> Hello stable maintainers,
> While working on some backports I'm about to send hopefully today or
> tomorrow, I was curious why the convention seems to be for folks to
> use "commit <sha> upstream." in commit messages?  I know that's what's
> in https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html#option-3,
> but I was curious whether the format from `git cherry-pick -xs <sha>`
> is not acceptable? I assume there's context as to why not?  It is nice
> to have that info uniformly near the top, but I find myself having to
> cherry-pick then amend a lot.  Or is there an option in git to
> automate the stable kernel's preferred style?

There is no option in git, but I do have a script:
	https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/scripts/c2p
that takes a git id and turns it into the format we use.

I think Sasha has one somewhere as well that does it in a nicer way
(mine is in perl and hard-codes a lot of stuff).

thanks,

greg k-h