Date: Fri, 11 Dec 2020 22:39:54 +0100 From: "Kristof Provost" <kp@FreeBSD.org> To: freebsd-git@freebsd.org Subject: MFC procedure? Message-ID: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org>
next in thread | raw e-mail | index | archive | help
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? Regards, Kristof From owner-freebsd-git@freebsd.org Fri Dec 11 22:33:03 2020 Return-Path: <owner-freebsd-git@freebsd.org> 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 5B8764BD3CD for <freebsd-git@mailman.nyi.freebsd.org>; Fri, 11 Dec 2020 22:33:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 4Ct5CM21VCz3FlC for <freebsd-git@freebsd.org>; Fri, 11 Dec 2020 22:33:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id h19so7665686qtq.13 for <freebsd-git@freebsd.org>; Fri, 11 Dec 2020 14:33:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=+XMf5cCYDilzw30/79QkK3aAZgTqDYU3xLwu+p2Gnds=; b=l6lyD3fbcKzWy03K+hMX0DfJRBJ3CIC2FSmVomen34PM7NXPyLO1O2Z5IdgqdqIIfK 1nQQzlN2dD+ldzh9MmzOIak+ajGzGFi4/q2jvQEtSYGfafHR2BFNMJiUqSgiFHg91zib ytoqB+4iLLDiVSm9QpcySrw7YT0onYWh1uebGD3M+kUHWFg36WZ3EwXx84ZbX4xpCAMm wJRnZ7EzdlCPvmMmg1k6cqNSAjH9iJyUCN5V89pQw+h3ZjbYgo9nFy21Qa7JZipc85N2 ORW8t2ZNM1nXqpPu6YIS83gGWntSvLXjxEyaZsw5vaaeIAXMfQMr1nizUrzUoIlfHyK+ keug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=+XMf5cCYDilzw30/79QkK3aAZgTqDYU3xLwu+p2Gnds=; b=dDntQreDqQ7v9oLnfLmhDhp6osHFQZ/VShfqggF0XlrMqZyR8WxsTFBpPLg7w4G3bo 0e8VK7tOKsiezTLoCzXMZOKJ4m3gskPEfkb0nsGxUuXk/QpPBRne6DP5IrjePKJJtReF QBkqXXaMHziiRCDW5i/f8RTiYgHekaTGcDum0fAX21XIPMiepynTxbqCecOvqio0vHXg v+MFxPVEzOLeXjnaevdIG86gozx7ELw1eOCjRky6rhdawMwyjv/t/YIS0/+uP2f6RdeS W48HEef/O46PEK0Ujwe0NuZLvcyWjI6AHs0jpuUd98ExdD6glfi8M/8QVETNXl5e7jq/ xjFw== X-Gm-Message-State: AOAM531SMDwjWi/GCMyCgx8ofF2PNNzvETJSF/Qqx0rEYfIuPdoRTYj2 cyjEo70v3y4FcHBnb2BMaWimOFEJW8lZ/6Sq07NuWQ== X-Google-Smtp-Source: ABdhPJy3CuMtSvmGx47Ft130k6wQiMlon92UPIMJzSD3+Hqg/PW1Xb5vgCcTZSifgl3frbwwF8+nBP+FDl1Yp+gHpbY= X-Received: by 2002:ac8:4910:: with SMTP id e16mr18357174qtq.244.1607725981555; Fri, 11 Dec 2020 14:33:01 -0800 (PST) MIME-Version: 1.0 References: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> In-Reply-To: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> From: Warner Losh <imp@bsdimp.com> Date: Fri, 11 Dec 2020 15:32:50 -0700 Message-ID: <CANCZdfqKSXN_mEgh1mvOAVGO-kPCSxj4AeG8xm6bQY+x7JGLZw@mail.gmail.com> Subject: Re: MFC procedure? To: Kristof Provost <kp@freebsd.org> Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Ct5CM21VCz3FlC X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org> List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>, <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>; List-Post: <mailto:freebsd-git@freebsd.org> List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help> List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>, <mailto:freebsd-git-request@freebsd.org?subject=subscribe> X-List-Received-Date: Fri, 11 Dec 2020 22:33:03 -0000 On Fri, Dec 11, 2020 at 2:40 PM Kristof Provost <kp@freebsd.org> wrote: > Hi, > > A discussion elsewhere about pre-commit triggers checking commit > permissions reminded me that I don=E2=80=99t yet fully know how we=E2=80= =99ll handle > MFCs. I=E2=80=9Dm thinking especially about MFCs of commits initially don= e 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=E2=80=99s relatively simple in Git: cherry pick the change, and run = `git > commit -amend =E2=80=94reset-author=E2=80=99 before pushing. > > While on the subject of MFC, I=E2=80=99m similarly not quite clear on wet= her > we plan to mirror SVN exactly and rewrite commit messages to include the > =E2=80=98MFC <commit hash>=E2=80=99, or if we=E2=80=99re going to do the = more git-y thing > of just cherry-picking and pushing like that. > > Perhaps I overlooked it, but I don=E2=80=99t 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. Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?08ED744D-CC2A-4871-8E59-9EE90550C860>