Date: Wed, 30 Dec 2020 23:51:02 -0800 From: Ravi Pokala <rpokala@freebsd.org> To: Stefan Esser <se@freebsd.org>, Yuri Pankov <yuripv@yuripv.dev>, Warner Losh <imp@bsdimp.com> Cc: src-committers <src-committers@freebsd.org>, <dev-commits-src-all@freebsd.org>, <dev-commits-src-branches@freebsd.org> Subject: Re: 162b82dfa0cb - MFC r355876 (by cem): Message-ID: <954BA92D-1D1C-41CA-870F-27CAE2A5C502@panasas.com> In-Reply-To: <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org> References: <202012251825.0BPIPntO091296@gitrepo.freebsd.org> <751dc337-b4dc-52de-f2ee-a843eb5e43c5@FreeBSD.org> <a292eb64-bd89-1ec8-a9f9-e2a9de28e4e5@yuripv.dev> <CANCZdfo1g1ias1g9uYgoaLb14Bd5TSqT9nghPWy3tODtncJ8Hw@mail.gmail.com> <20be96cf-1cda-d914-5759-aae90169d8c0@yuripv.dev> <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
-----Original Message-----
From: <owner-src-committers@freebsd.org> on behalf of Stefan Esser <se@freebsd.org>
Date: 2020-12-26, Saturday at 00:49
To: Yuri Pankov <yuripv@yuripv.dev>, Warner Losh <imp@bsdimp.com>
Cc: src-committers <src-committers@freebsd.org>, <dev-commits-src-all@freebsd.org>, <dev-commits-src-branches@freebsd.org>
Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem):
Am 26.12.20 um 06:36 schrieb Yuri Pankov:
> Warner Losh wrote:
>> I was rather hoping we'd land around using the old commit message, as
>> is, and let the cherry-picked message at the end signify the MFC, at
>> least for simple cherry-picks.
>>
>> For squashed ones, a sensible new summary line and an appropriate commit
>> message would be good as well... Where appropriate is approximately what
>> we do today, with all the hashes that we're merging mentioned.
>
> I am following the docs (and those make sense to me), `git cherry-pick
> -x` is just enough; if it's direct commit, I'd add a note. So yes, any
> commit to stable/* is MFC, unless stated otherwise.
I'd like to get back the branch in the subject line, not only the first
line of the commit message:
It used to be: "svn commit: r368706 - in stable/12:", but now we only
have the git hash in the subject line and "The branch ... has been
updated ..." in the first line of the commit message.
I was going to request this as well, but it looks like we started getting them as of 2020-12-26 20:50-ish.
So, thank you to whoever did that! :-)
-Ravi (rpokala@)
Filtering out commits to -STABLE/RELENG is possible via "X-Git-Refname"
(I hope this header line will be kept in exactly the current form to
not require later adjustment of the filter), but it is no longer easy
to see whether a commit affects -CURRENT by just looking at the subject
line of the commit message ...
Regards, STefan
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?954BA92D-1D1C-41CA-870F-27CAE2A5C502>