Date: Fri, 11 Dec 2020 18:06:04 -0500 From: Shawn Webb <shawn.webb@hardenedbsd.org> To: Warner Losh <imp@bsdimp.com> Cc: Kristof Provost <kp@freebsd.org>, freebsd-git@freebsd.org Subject: Re: MFC procedure? Message-ID: <20201211230604.sohyte3dfocfmx2r@mutt-hbsd> In-Reply-To: <CANCZdfqKSXN_mEgh1mvOAVGO-kPCSxj4AeG8xm6bQY%2Bx7JGLZw@mail.gmail.com> References: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> <CANCZdfqKSXN_mEgh1mvOAVGO-kPCSxj4AeG8xm6bQY%2Bx7JGLZw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--brkoskdolpapl5ex Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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@freebsd.org> wrote: >=20 > > 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? > > >=20 > 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. >=20 > 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. >=20 > 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 loc= al > tradition. >=20 > 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, --=20 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/Sha= wn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --brkoskdolpapl5ex Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl/T+1kACgkQ/y5nonf4 4fqB1g//ZL9yMWdNaY0/SEHgmxMXypC+pvnVKjr9kZ/uNXdG+sI9h51mFrMMY0ae 4n4Jv4fvr7F+puyvt2Ox1TsIW4SI+m8A7AkcFN1BGxuo6osOqqjudbthWpxOcn1+ pb+iuq0jraq2Dzwx2y6qJVmQIzV0GpmLO9YGtUZCdF+saY4OUbk6UQHCsi+XgHRR h+H84NZQUBHtjr7Mr3EnwQ+Uq3gy+1Fw4XSs8amyjXkwb7tiQcHfTdK/+QNKmDR8 gC/n6C3t9vOoXY/THD/nTI7WfXkgSH+W2LTPLsVLnEbb6Q+XskDXpiNM09bsQ3hO 0xnQ5CLiLDn4ZArgnh6xJLIM/WZlDrTASiMkkOwpctz8H+zFDIKXfDy75raZya4Q QZn35KQu3FH+NlK5enwBQu+n6qOuDsF9r8aWzrwgC2AfKe1QQs/HkX03uU8GeNRH H7adluLALkJCbqEpecv3+bK+pKsx4ZVW2sV3syrKvTr0Gts32VDXMIznQ7qLZw5M 2BAZKu1BkIiu4dJ9yNxjHbZ15V21wALZhneXoKXlLzyNCk6LlCbrBheuIv8RLpDs d0hH3qta02ddXBa0klc+6b+2abFkZ54RkJklZaXGcSTkmu5m+sehzURvAUs91WYi lRxqNiSr9d3ELJU3EbUtToM+xbuLFCEC1tsds8LnsLX3MZCOU34= =tKyZ -----END PGP SIGNATURE----- --brkoskdolpapl5ex--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20201211230604.sohyte3dfocfmx2r>