git: 162b82dfa0cb - MFC r355876 (by cem):

[Ulrich Spörlein]

On Sun, 2020-12-27 at 03:57:55 +0800, Li-Wen Hsu wrote:
>On Sat, Dec 26, 2020 at 6:53 PM Ulrich Spörlein <uqs at freebsd.org> wrote:
>>
>> On Sat, Dec 26, 2020 at 9:50 AM Stefan Esser <se at 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 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.
>>>
>>> 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", see:
>
>https://svnweb.freebsd.org/base/svnadmin/hooks/scripts/mailer.py?revision=320410&view=markup#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.

Thank you for the quick fix!

No, adding commondir isn't all that useful, in SVN it was needed as a 
single rev could span multiple "branches", but that's not the case in 
git. And we should become a little better in that first-line commit 
summary to obsolete further needs for commondir magic anyway.

Thanks
Uli