From owner-dev-commits-ports-main@freebsd.org Wed Apr 14 21:07:21 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 A86495D0791; Wed, 14 Apr 2021 21:07:21 +0000 (UTC) (envelope-from matthias.andree@tu-dortmund.de) Received: from unimail.uni-dortmund.de (mx1.hrz.uni-dortmund.de [129.217.128.51]) (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-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "unimail.tu-dortmund.de", Issuer "DFN-Verein Global Issuing CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FLFRF3c7bz4Ssf; Wed, 14 Apr 2021 21:07:20 +0000 (UTC) (envelope-from matthias.andree@tu-dortmund.de) Received: from mandree.no-ip.org (p54a03fdc.dip0.t-ipconnect.de [84.160.63.220]) (authenticated bits=0) by unimail.uni-dortmund.de (8.16.1/8.16.1) with ESMTPSA id 13EL7IPq020378 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NOT); Wed, 14 Apr 2021 23:07:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tu-dortmund.de; s=unimail; t=1618434438; bh=eJOLC+SklWb1r+Wq8zhkikkegaLs/aPLD0UJyyh6lPA=; h=To:Cc:References:From:Subject:Date:In-Reply-To; b=XlfmKIHytUtKpZVum8GRerlDsHSDnOjAqvdqY1G2D8z0Z8S1I0SbpJpCHjA3q9jmn /Fhdai4IzYbCKQEBveGfQzGHHhTeejmCyJlgRhjNhXQ2gbeK3sa0trW/tU1gRStIMp +DtPQ2jIqvCUzTGlroF0af25e9iMwUWsAAFJIZgw= Received: from ryzen.an3e.de (localhost [IPv6:::1]) by ryzen.an3e.de (Postfix) with ESMTP id 7EEB1122E27; Wed, 14 Apr 2021 23:07:18 +0200 (CEST) To: =?UTF-8?Q?Bernhard_Fr=c3=b6hlich?= Cc: ports-committers , "dev-commits-ports-all@freebsd.org" , "dev-commits-ports-main@freebsd.org" , Kyle Evans References: <202104131930.13DJUwl4024751@gitrepo.freebsd.org> From: Matthias Andree Subject: Re: git: 2ef23d42cbce - main - net/wireguard-kmod: Update to 0.0.20210412 Message-ID: <1f958906-7baa-b612-c4e7-3355e1779b07@tu-dortmund.de> Date: Wed, 14 Apr 2021 23:07:18 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4FLFRF3c7bz4Ssf 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: Wed, 14 Apr 2021 21:07:21 -0000 Am 14.04.21 um 22:19 schrieb Bernhard Fröhlich: > > > On Wednesday, April 14, 2021, Kyle Evans > wrote: > > On Tue, Apr 13, 2021 at 2:31 PM Bernhard Froehlich > > wrote: > > > > The branch main has been updated by decke: > > > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=2ef23d42cbce1ed168e6f540e6d751a8deb57de0 > > > > > commit 2ef23d42cbce1ed168e6f540e6d751a8deb57de0 > > Author:     Bernhard Froehlich > > AuthorDate: 2021-04-13 19:29:52 +0000 > > Commit:     Bernhard Froehlich > > CommitDate: 2021-04-13 19:30:52 +0000 > > > >     net/wireguard-kmod: Update to 0.0.20210412 > > Any chance of an MFH to 2021Q2 for this and the previous > wireguard-tools commit for quarterly users? > > Thanks, > > Kyle Evans > > > It took me some time to get used to that new cherry pick workflow with a > shallow checkout. But it's done now. Another reason to revive mfh... You can instead also do this, without doing a separate clone: git stash # save your uncommitted changes git checkout 2021Q2 # switch to quarterly git pull --rebase # update it git cherry-pick -x c0decafe deadbeef # "MFH" git show main.. # REVIEW THE CHANGES! git push # publish - this is the point of no return git checkout main # go back to main branch git pull --rebase # OPTIONAL, update if you want git stash pop # if you had used git stash Yes, this updates lots of files on the "git checkout ". Or, if you want to do a shallow clone, you can also reference or share your existing ports tree to save download time, and you can also do a sparse checkout, documented earlier (see thread "Git sparse checkout" thread started by Fernando Apesteguía on April 7.