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

Ulrich Spörlein uqs at freebsd.org
Sat Dec 26 10:52:59 UTC 2020


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), 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.

Cheers
Uli


More information about the freebsd-git mailing list