MFC procedure?

[Oliver Pinter]

On Friday, December 11, 2020, 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 used the following command to mfc changes from git to git:
https://github.com/opntr/opbsd-tools/blob/opbsd/opbsd_mfc.sh

and this will be an example commit
https://github.com/opntr/opBSD-ng/commit/0a08454bf2618c6f22086641e95d7c6058967d63




>
> Regards,
> Kristof
> _______________________________________________
> freebsd-git at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-git
> To unsubscribe, send any mail to "freebsd-git-unsubscribe at freebsd.org"
>