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

[Juraj Lutter]

> On 14 Apr 2021, at 23:07, Matthias Andree <matthias.andree at tu-dortmund.de> wrote:
> 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.

Or, if your local environment (disk space mostly) permits, you can use worktrees
and have main and 2021Q2 checked out in separate directories.

Then you can cherry-pick using (72b4a1887cc241991ab1b81ace9d3ec392b8ea93 is the commit in main):

otis at b13:/usr/ports-branches/2021Q2 % git cherry-pick -x 72b4a1887cc241991ab1b81ace9d3ec392b8ea93
[freebsd/2021Q2 fec1d972fb19] sysutils/beats6: Update to 6.8.15
 Date: Wed Apr 7 16:29:54 2021 +0200
 2 files changed, 4 insertions(+), 4 deletions(-)
otis at b13:/usr/ports-branches/2021Q2 % git show fec1d972fb1
commit fec1d972fb19a6f88bb2624dd2865a51f7957c76 (HEAD -> freebsd/2021Q2)
Author: Juraj Lutter <otis at FreeBSD.org>
Date:   Wed Apr 7 16:29:54 2021 +0200

    sysutils/beats6: Update to 6.8.15

    (cherry picked from commit 72b4a1887cc241991ab1b81ace9d3ec392b8ea93)

and now you can push.

otis