From owner-dev-commits-ports-main@freebsd.org Mon Apr 12 22:26:32 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 DA6255E08B5; Mon, 12 Apr 2021 22:26:32 +0000 (UTC) (envelope-from freebsd@toco-domains.de) Received: from toco-domains.de (mail.toco-domains.de [176.9.100.27]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FK3HX5CzSz3F66; Mon, 12 Apr 2021 22:26:32 +0000 (UTC) (envelope-from freebsd@toco-domains.de) Received: from [192.168.0.122] (ip-95-223-107-134.hsi16.unitymediagroup.de [95.223.107.134]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by toco-domains.de (Postfix) with ESMTPSA id 51B42C400B; Tue, 13 Apr 2021 00:26:24 +0200 (CEST) Subject: Re: git: a4c3b6f622b8 - main - Remove two tools that are no longer useful with Git. To: Matthias Andree , Mathieu Arnold , Gerald Pfeifer Cc: Rene Ladan , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <202104061040.136Ae3MR086471@gitrepo.freebsd.org> <8cde99cd-c64a-a85e-68dd-94bcf1d6999b@pfeifer.com> <20210412120941.ro5rv7vaokglgt7l@aching.in.mat.cc> <0c47579d-9221-4bb4-4298-fac4cff3c543@tu-dortmund.de> From: Torsten Zuehlsdorff Message-ID: <9bf24e4c-6543-eda5-1e3d-3cf8bdf95dc3@toco-domains.de> Date: Tue, 13 Apr 2021 00:26:23 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <0c47579d-9221-4bb4-4298-fac4cff3c543@tu-dortmund.de> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FK3HX5CzSz3F66 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Apr 2021 22:26:32 -0000 On 12.04.21 23:55, Matthias Andree wrote: > Am 12.04.21 um 14:09 schrieb Mathieu Arnold: >> On Sat, Apr 10, 2021 at 10:57:20PM +0200, Gerald Pfeifer wrote: >>> On Tue, 6 Apr 2021, Rene Ladan wrote: >>>> Remove two tools that are no longer useful with Git. >>>> >>>> - mfh: this is replaced by 'git cherry-pick -x HASH' >>> >>> I believe it would be useful to still have such a tool that one simply >>> invokes as "mfh $COMMITID" for the quarterly branch as in the past. >>> >>> https://docs.freebsd.org/en/articles/committers-guide/#ports-qa-misc-commit-mfh >>> has instructions on how to do this manually, alas that is quite not >>> as convenient - and hence likely to be used - as the nice original >>> mfh tool. >> >> Well, with Git, mfh would end up being: >> >> git checkout 2021Q2 >> git cherry-pick -x $COMMITID >> git push origin 2021Q2 >> >> I would rather committers learn how to use git (it is, after all, what >> they are here for) and then, they can magically now test before pushing. >> > > This is a fundamental misunderstanding of the purpose. > Committers/developers are not here to learn Git, > but they are here to develop. Git is a tool, not an end in itself. > > I also ask to revive the tool. If it's so simple then there is no need > to kill it. Also beside saving some time you can add some benefits. Like adding a check if you are actually pushing into the correct quarterly branch. Lets bring back some of the easy checks! Best, Torsten