Date: Sat, 26 Dec 2020 09:49:48 +0100 From: Stefan Esser <se@freebsd.org> 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): Message-ID: <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org> In-Reply-To: <20be96cf-1cda-d914-5759-aae90169d8c0@yuripv.dev> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --SkEQQL2fZPpUaJGzpVPCDrd9B7eLSnXOR Content-Type: multipart/mixed; boundary="FnUNn6u6yGUIUEp23DZvT7Basfgk2mRol"; protected-headers="v1" From: Stefan Esser <se@freebsd.org> 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 Message-ID: <12fd95e4-3a29-115c-72ff-b734baeffe5b@freebsd.org> Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): 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> In-Reply-To: <20be96cf-1cda-d914-5759-aae90169d8c0@yuripv.dev> --FnUNn6u6yGUIUEp23DZvT7Basfgk2mRol Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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 comm= it >> message would be good as well... Where appropriate is approximately=C2= =A0what >> we do today, with all the hashes that we're merging mentioned. >=20 > 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. 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 --FnUNn6u6yGUIUEp23DZvT7Basfgk2mRol-- --SkEQQL2fZPpUaJGzpVPCDrd9B7eLSnXOR Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEo3HqZZwL7MgrcVMTR+u171r99UQFAl/m+SwFAwAAAAAACgkQR+u171r99USH fggAm8J/fhB3fmxAkk/IVcadefqqCoKYrABJpskTbM0lLpghw/kvW0znDgl23BICFnYDK7+3kAiq 9U5J9i4v9REoWyGAA23v40GoF+XB+B8FMve2u3Dp/P9Mi7en84Et7YRJVKsadgKTV5k04jwWFLvv ng3N+yZQO7kDM1EmX3r4KMVRsTfGNEMnWbG3aQr07d7khOsOUJFMDM9p6igMKKpfNzQw9LN0vQ8o ntsUwIA9t94/d4eFuSLJpzqWvxaNLzr4rsBGDSyes6GKmTxjHwz94G8xMb7lfscuEtTuGzZcs7Y+ UV28BBQ1sKughm21GkycCuGfxZqJ9FiiYnWVAVzaDQ== =DKP8 -----END PGP SIGNATURE----- --SkEQQL2fZPpUaJGzpVPCDrd9B7eLSnXOR--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?12fd95e4-3a29-115c-72ff-b734baeffe5b>