git: 08c22f24c94d - 2021Q2 - security/openvpn: security update to v2.5.2
Jan Beich
jbeich at FreeBSD.org
Wed Apr 21 18:38:13 UTC 2021
Matthias Andree <mandree at FreeBSD.org> writes:
> Am 21.04.21 um 19:49 schrieb Matthias Andree:
>
>> The branch 2021Q2 has been updated by mandree:
>>
>> URL: https://cgit.FreeBSD.org/ports/commit/?id=08c22f24c94d9310d984e2ce0aa3c840bb5accd2
>>
>> commit 08c22f24c94d9310d984e2ce0aa3c840bb5accd2
>> Author: Matthias Andree <mandree at FreeBSD.org>
>> AuthorDate: 2021-04-21 17:46:21 +0000
>> Commit: Matthias Andree <mandree at FreeBSD.org>
>> CommitDate: 2021-04-21 17:48:38 +0000
>>
> ...
>> (cherry picked from commit 6271ca01ce9d0733b650b42cdf98813b27758370)
>
> Lesson learned:
> pull --rebase and push main first, then cherry-pick the MFH.
Or use "git push --atomic freebsd main 2021Q2". From manpage:
--[no-]atomic
Use an atomic transaction on the remote side if available. Either
all refs are updated, or on error, no refs are updated. If the
server does not support atomic pushes the push will fail.
I did test this e.g., d149560bb859 (regular multi-branch push) and
0328b140894b (multi-branch with --atomic).
More information about the dev-commits-ports-all
mailing list