From owner-freebsd-git@freebsd.org Sat Dec 12 19:04:50 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 B40AF4BDB96 for ; Sat, 12 Dec 2020 19:04:50 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-oi1-x22e.google.com (mail-oi1-x22e.google.com [IPv6:2607:f8b0:4864:20::22e]) (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 4CtcXf4WZrz3phZ; Sat, 12 Dec 2020 19:04:50 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: by mail-oi1-x22e.google.com with SMTP id p126so14142463oif.7; Sat, 12 Dec 2020 11:04:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=kA0e3Y70PvN2ESuRJZsJAZQRVN+Y0LhdufWGJJsv4x0=; b=XT99BcmkiFt0NWoRM6XjuqPGpF3BYLgcY3JjPugSQN6ItEc4wVksvLdjBl4Xpas8+o +mLUoawpdH8efVPbkn9Hb/EZEem0JGIgNnmfXp0rbtWcSPeS5vclIvT3xqrfqpiGmnxW ewsAvLwsVWtOvlDL84sAU1qVwv6W564cOBGuveXVkdk0ppZW/uRtvPm+1VoR9g3xx1K5 0jLYz7nbRCavwFb09jZgBoH3cbDlGuq7CzfuDyNRjWaGnDKk3GkzJI7NzxTzT+9wjxnj IAWtS2SB0qElouCHgpMNSpaSUTvGG5lxBH9Mv3Z4hPmOspi/Zn76ukU6AWmKlRzphs1o oyqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=kA0e3Y70PvN2ESuRJZsJAZQRVN+Y0LhdufWGJJsv4x0=; b=AX6wXqu4fMBgqOC9Y7x+BXv75e+wRymU7pmj+xOur2fqpGNShgjIuqNdCamQZGo+NG L72e+vXPTFh3RIrogdv+oTZxdBqckFTQUBbYDqgCiayY+Zv+aQAhRu6hBeQi1b4E09EA yrdym1jz+3NX61bpmClHnwS8iTrMJb503mJlz8iH9s+jCgiE3T1c/mRcEDyQLXKiDqLH I2sNfeHbgdzCYjhrvg0igTkm0K49Mm9/5KoX8sX9Ieu/ko0xJIQY6obbFnR299nZFkOM xGkIn2LeCxiNoZ7z74lQEiFKhyfXITncIwzao/Kbpby1Bh+ta3zCV6/gYhsCTq9sSPVS kPVA== X-Gm-Message-State: AOAM531Uxzyi7JI9JABVlK/JYZN8oMjLJOhImutvZlVu1RnPeZQ2o425 qvKYkBBEd1OCZjqjFcY0vGOWTq3LNBxzsJnyyhnunPCH X-Google-Smtp-Source: ABdhPJxT3c2iN94X1CDSXCsQpNhEOhcs9exSHHydFWgWgoGoWjPRDQ/BN+Al+Ykw0mjvX1pyQ9XbTqfv//iwXj5B/oE= X-Received: by 2002:aca:61c5:: with SMTP id v188mr13631950oib.66.1607799889423; Sat, 12 Dec 2020 11:04:49 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a4a:970e:0:0:0:0:0 with HTTP; Sat, 12 Dec 2020 11:04:48 -0800 (PST) In-Reply-To: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> References: <08ED744D-CC2A-4871-8E59-9EE90550C860@FreeBSD.org> From: Oliver Pinter Date: Sat, 12 Dec 2020 20:04:48 +0100 Message-ID: Subject: Re: MFC procedure? To: Kristof Provost Cc: "freebsd-git@freebsd.org" X-Rspamd-Queue-Id: 4CtcXf4WZrz3phZ X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Dec 2020 19:04:50 -0000 On Friday, December 11, 2020, Kristof Provost 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 done by s= omeone > 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= =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 > =E2=80=99, or if we=E2=80=99re going to do the more git-y th= ing 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 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/0a08454bf2618c6f22086641e95d7c6058= 967d63 > > Regards, > Kristof > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >