Date: Fri, 25 Dec 2020 22:33:37 -0700 From: Warner Losh <imp@bsdimp.com> To: Yuri Pankov <yuripv@yuripv.dev> Cc: Andriy Gapon <avg@freebsd.org>, Vladimir Kondratyev <wulf@freebsd.org>, 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: <CANCZdfo1g1ias1g9uYgoaLb14Bd5TSqT9nghPWy3tODtncJ8Hw@mail.gmail.com> In-Reply-To: <a292eb64-bd89-1ec8-a9f9-e2a9de28e4e5@yuripv.dev> References: <202012251825.0BPIPntO091296@gitrepo.freebsd.org> <751dc337-b4dc-52de-f2ee-a843eb5e43c5@FreeBSD.org> <a292eb64-bd89-1ec8-a9f9-e2a9de28e4e5@yuripv.dev>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Dec 25, 2020 at 10:31 PM Yuri Pankov <yuripv@yuripv.dev> wrote: > Andriy Gapon wrote: > > On 2020-12-25 20:25, Vladimir Kondratyev wrote: > >> MFC r355876 (by cem): > >> > >> acpi(4): Add _CID to PNP info string > > > > > > I think that it would be better to merge those two lines into one. > > From the perspective of git log --oneline. > > Indeed, the MFC stuff does not make much sense anymore, I'd rather see > real commit message, even if it's just git tooling showing first line of > commit (--oneline, eh?). > 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. Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfo1g1ias1g9uYgoaLb14Bd5TSqT9nghPWy3tODtncJ8Hw>