From owner-freebsd-git@freebsd.org Fri Dec 11 23:06:06 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E0AB44BE16B for ; Fri, 11 Dec 2020 23:06:06 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ct5xV5ml3z3JGG for ; Fri, 11 Dec 2020 23:06:06 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qk1-x735.google.com with SMTP id z188so10133931qke.9 for ; Fri, 11 Dec 2020 15:06:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=9TTBM73kLk2Lm28f5y+Y3pRiZGqxLklJ7XVIpGIeW+E=; b=MUn3Rxpd2LrB3C+THDtMJ/zVZh/54S1yfDdP6ayElqXK5snK6rAs+RvtiDQPX2BneD +FV1rhHtFIR+Vqt2pPQfeB6evb7eJGsS1O+4cAuCCCissVV9vHecGuxPoYoLcjrmQpg3 rdsflGnjNGF0eEwqW87O5ETn8f97JbQyqVi0I2c6n1TQ0/P9MSPLHKl7ByfsZm1BWmKG LujvWzTlAxr2ymwAuL93xhJEpGPdyZLPIjV8k3lIfKmsv18g6/AAkS2foK2xRS1rTFAJ v5kWK44LAg64g/JGkV5Da0UtRkSQ2vzoP7CouedhzaW0IHSMNHGJV5Hbr6xhWh5rEwWn AOAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=9TTBM73kLk2Lm28f5y+Y3pRiZGqxLklJ7XVIpGIeW+E=; b=g6zOhhJXM3UiGQ8vCQjD9jL1zBVpJ4VeKn9QrudxKEnWxcJeHcDnlqXCXQscgmU6Sp kpUa7HMpflDsDWVro6iMelPwuHLt989fOCbhZEqEdIHVEu/ABtNJI1IRpWbH50Vdw6H9 jM4xiyvpo369SMtcaMS+0VARSUE0v/1WYMbwr3O4+/bNxebLTCf8XPu8x1cjUBvkWoFj 0wy+YmiPYf66kOrst3RFHIV1Ng/ReVI+sCdaSYKym4n9LfySYFAhO6mQ7onI0eBBjVxl 7iDQPbqkbpXVx5w6C0hqjGXenbreckmC4SwmNRTvNKVJp2CWzEJ4UO1oTQBWFpQfm2LG /oig== X-Gm-Message-State: AOAM533A0pxxlRYcHYJQ8z+9TiBl6MCeOwYg9jcYxvsrbCeK6s+wozNC PWC/BC+Fun6UevaRohoKnp9iYA== X-Google-Smtp-Source: ABdhPJwL6v+XYgraFsfq4oE3RkTwDX5+H/+nmFp3zcNrnyEEn5sGy2+eDKJff5Ft7i6zKggN0Nx94A== X-Received: by 2002:a37:2e05:: with SMTP id u5mr8005279qkh.228.1607727965663; Fri, 11 Dec 2020 15:06:05 -0800 (PST) Received: from mutt-hbsd (pool-100-16-222-53.bltmmd.fios.verizon.net. [100.16.222.53]) by smtp.gmail.com with ESMTPSA id g63sm8409157qkf.80.2020.12.11.15.06.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 15:06:04 -0800 (PST) Date: Fri, 11 Dec 2020 18:06:04 -0500 From: Shawn Webb To: Warner Losh Cc: Kristof Provost , freebsd-git@freebsd.org Subject: Re: MFC procedure? Message-ID: <20201211230604.sohyte3dfocfmx2r@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA References: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="brkoskdolpapl5ex" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4Ct5xV5ml3z3JGG X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Dec 2020 23:06:06 -0000 --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 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 ` 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 ???, 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--