Date: Wed, 14 Apr 2021 23:07:18 +0200 From: Matthias Andree <matthias.andree@tu-dortmund.de> To: =?UTF-8?Q?Bernhard_Fr=c3=b6hlich?= <decke@freebsd.org> Cc: ports-committers <ports-committers@freebsd.org>, "dev-commits-ports-all@freebsd.org" <dev-commits-ports-all@freebsd.org>, "dev-commits-ports-main@freebsd.org" <dev-commits-ports-main@freebsd.org>, Kyle Evans <kevans@freebsd.org> Subject: Re: git: 2ef23d42cbce - main - net/wireguard-kmod: Update to 0.0.20210412 Message-ID: <1f958906-7baa-b612-c4e7-3355e1779b07@tu-dortmund.de> In-Reply-To: <CAE-m3X0o-3LnpaF8hAA6ha6HEwTzbUmV2OH5HEqBTPu5vaLOWA@mail.gmail.com> References: <202104131930.13DJUwl4024751@gitrepo.freebsd.org> <CACNAnaHSK4cmM-jYsD00FQvtZ0%2BSPvzM86_DbiTCPtMfii0niQ@mail.gmail.com> <CAE-m3X0o-3LnpaF8hAA6ha6HEwTzbUmV2OH5HEqBTPu5vaLOWA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Am 14.04.21 um 22:19 schrieb Bernhard Fröhlich: > > > On Wednesday, April 14, 2021, Kyle Evans <kevans@freebsd.org > <mailto:kevans@freebsd.org>> wrote: > > On Tue, Apr 13, 2021 at 2:31 PM Bernhard Froehlich > <decke@freebsd.org <mailto:decke@freebsd.org>> wrote: > > > > The branch main has been updated by decke: > > > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=2ef23d42cbce1ed168e6f540e6d751a8deb57de0 > <https://cgit.FreeBSD.org/ports/commit/?id=2ef23d42cbce1ed168e6f540e6d751a8deb57de0>; > > > > commit 2ef23d42cbce1ed168e6f540e6d751a8deb57de0 > > Author: Bernhard Froehlich <decke@FreeBSD.org> > > AuthorDate: 2021-04-13 19:29:52 +0000 > > Commit: Bernhard Froehlich <decke@FreeBSD.org> > > 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 <branchname>". 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 <fernando.apesteguia@gmail.com> on April 7.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1f958906-7baa-b612-c4e7-3355e1779b07>