git: 2ef23d42cbce - main - net/wireguard-kmod: Update to 0.0.20210412

Matthias Andree matthias.andree at tu-dortmund.de
Wed Apr 14 21:07:21 UTC 2021


Am 14.04.21 um 22:19 schrieb Bernhard Fröhlich:
> 
> 
> On Wednesday, April 14, 2021, Kyle Evans <kevans at freebsd.org
> <mailto:kevans at freebsd.org>> wrote:
> 
>     On Tue, Apr 13, 2021 at 2:31 PM Bernhard Froehlich
>     <decke at freebsd.org <mailto:decke at 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 at FreeBSD.org>
>     > AuthorDate: 2021-04-13 19:29:52 +0000
>     > Commit:     Bernhard Froehlich <decke at 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 at gmail.com> on
April 7.


More information about the dev-commits-ports-all mailing list