Date: Sun, 27 Dec 2020 03:57:55 +0800 From: Li-Wen Hsu <lwhsu@freebsd.org> To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> Cc: Stefan Esser <se@freebsd.org>, git@freebsd.org, Yuri Pankov <yuripv@yuripv.dev>, Warner Losh <imp@bsdimp.com> Subject: Re: git: 162b82dfa0cb - MFC r355876 (by cem): Message-ID: <CAKBkRUw6sS8-OwNh7Sri5042n6mREFz_0P34gCsK-=8C95NUuw@mail.gmail.com> In-Reply-To: <CAJ9axoS5JA0ni_nhHQqLhuwLVVsX1rO6iKxkbaB7ftvSbXKNAA@mail.gmail.com> 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> <CAJ9axoS5JA0ni_nhHQqLhuwLVVsX1rO6iKxkbaB7ftvSbXKNAA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Dec 26, 2020 at 6:53 PM Ulrich Sp=C3=B6rlein <uqs@freebsd.org> wrot= e: > > On Sat, Dec 26, 2020 at 9:50 AM Stefan Esser <se@freebsd.org> wrote: >> >> 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 com= mit >> >> message would be good as well... Where appropriate is approximately w= hat >> >> 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, an= y >> > 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), This header line will be kept unless there is a very good reason. >> 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 >> > > I agree. Especially since you cannot filter on X-Git-Refname in Gmail :( > > Having the subject be: git: hash - branch-name - one-line-subject > > would be ideal and mimic previous behaviour better. This has just been deployed. Hope this helps. BTW, the original "branch" of the subject in svn is actually "commondir", s= ee: https://svnweb.freebsd.org/base/svnadmin/hooks/scripts/mailer.py?revision= =3D320410&view=3Dmarkup#l509 And there is only X-SVN-Commit-Paths in header, contains list of directories modified. I think having a branch name in the header and subject does help as we now have a single list for all non-main branches. I'm not sure if having the dirlist added in header and subject, or even body may help, but if people find it's useful, I'm happy to see if it is possible to port to our git system. Best, Li-Wen
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAKBkRUw6sS8-OwNh7Sri5042n6mREFz_0P34gCsK-=8C95NUuw>