MFC procedure?

[Shawn Webb]

On Fri, Dec 11, 2020 at 03:32:50PM -0700, Warner Losh wrote:
> On Fri, Dec 11, 2020 at 2:40 PM Kristof Provost <kp at freebsd.org> wrote:
> 
> > Hi,
> >
> > A discussion elsewhere about pre-commit triggers checking commit
> > permissions reminded me that I don???t yet fully know how we???ll handle
> > MFCs. I???m thinking especially about MFCs of commits initially done by
> > someone else. A `git cherry-pick <hash>` will result in an author tag
> > with the original author.
> >
> > Do we want to change the committer name? If so, as I understand it
> > that???s relatively simple in Git: cherry pick the change, and run `git
> > commit -amend ???reset-author??? before pushing.
> >
> > While on the subject of MFC, I???m similarly not quite clear on wether
> > we plan to mirror SVN exactly and rewrite commit messages to include the
> > ???MFC <commit hash>???, or if we???re going to do the more git-y thing
> > of just cherry-picking and pushing like that.
> >
> > Perhaps I overlooked it, but I don???t see any documentation on
> > changes/expectations for MFCs in a git world. Would it be helpful if I
> > wrote up a proposal for whichever option the transition team prefers?
> >
> 
> I've not written up the proposed MFC procedure. I plan on doing that after
> I get the vendor import stuff I'm working on right now done.
> 
> I suspect that we'll mirror much of the SVN process and we'll have a messy
> period while we figure out what works best for us.
> 
> These are all good questions. I think the answers are "we want to add -x to
> the git cherry-pick" to cope with the MFC tag, and we want to retain them
> all for squashed MFCs. We'll want to reset the author to conform with local
> tradition.
> 
> I'll post it to this list when I've written it up, and I'll be sure to CC
> you.

For what it's worth, HardenedBSD MFCs its commits with the following
command:

$ git cherry-pick -xs commit_hash

Thanks,

-- 
Shawn Webb
Cofounder / Security Engineer
HardenedBSD

GPG Key ID:          0xFF2E67A277F8E1FA
GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9  3633 C85B 0AF8 AB23 0FB2
https://git-01.md.hardenedbsd.org/HardenedBSD/pubkeys/src/branch/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-git/attachments/20201211/00ac7c33/attachment.sig>