From owner-dev-commits-ports-all@freebsd.org  Wed Apr 21 18:38:13 2021
Return-Path: <owner-dev-commits-ports-all@freebsd.org>
Delivered-To: dev-commits-ports-all@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 459295EE9D6;
 Wed, 21 Apr 2021 18:38:13 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132])
 (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 (4096 bits) client-digest SHA256)
 (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4FQTnx1X6mz3tJ8;
 Wed, 21 Apr 2021 18:38:13 +0000 (UTC)
 (envelope-from jbeich@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
 t=1619030293;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 in-reply-to:in-reply-to:references:references;
 bh=f5LHDXPSamb4y+ok6+cd3sleHf6lWRqj3fBPk0CZG7Y=;
 b=WbzZytyuo7c8yGPUVsRD/rO0xQvbEbxJTczz+OkEP0ITjQef5JDAxxObi/zov6psC0ld86
 G9NYWceOBmJ6YHIoaMJ83jh9/FzTGIfl5Bw4TRskVfMN68387VPj8VnK+biXT2cpcOjvu/
 SD8l2CtVbt0VvAkZUceyjVPeisRGc6spKsdTzgcTjg5XiQViP7AcSuiVMq04ATgg3YB4D+
 9sXxIV0zYUviFDvA7p5ZjEHKIS5M3q6BAo9oVvCWG4nQo7IplkAX0n+QMIvcJql6ltXsMH
 bBTZWiuAIhuXGDKgbhHPuoQCqJtrPcc4+AX95Gq5M5frE64PsZz0+hXfeEB/wg==
Received: by freefall.freebsd.org (Postfix, from userid 1354)
 id 1AEE2232B6; Wed, 21 Apr 2021 18:38:13 +0000 (UTC)
From: Jan Beich <jbeich@FreeBSD.org>
To: Matthias Andree <mandree@FreeBSD.org>
Cc: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
 dev-commits-ports-branches@FreeBSD.org
Subject: Re: git: 08c22f24c94d - 2021Q2 - security/openvpn: security update
 to v2.5.2
References: <202104211749.13LHnDok003531@gitrepo.freebsd.org>
 <129910f9-cab1-c219-e8d5-52fd3776e429__24805.0403710053$1619027639$gmane$org@FreeBSD.org>
Date: Wed, 21 Apr 2021 20:38:08 +0200
In-Reply-To: <129910f9-cab1-c219-e8d5-52fd3776e429__24805.0403710053$1619027639$gmane$org@FreeBSD.org>
 (Matthias Andree's message of "Wed, 21 Apr 2021 19:53:47 +0200")
Message-ID: <7dkv-sctr-wny@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
 s=dkim; t=1619030293;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 in-reply-to:in-reply-to:references:references;
 bh=f5LHDXPSamb4y+ok6+cd3sleHf6lWRqj3fBPk0CZG7Y=;
 b=ST8LWhy2uWc2JvwZYJAV66I5AtWpazxk+ObB7/qhiO5rj5Gwlxbq/95GQG9IUM460sapkC
 ag9sO9qxRCG8ON8nAepWn5+p1tmsVyQQRqmepYzjuAoqKfx4a5ekSX4ffbgFqDLaXbtG2n
 2wvTXRf7/GSU4tRApV/08FYY+PQap4iJ49flyYIyr+k8C5LJfSwC8yZ5414znc1zBGkB80
 b0in6OPwOsRLJEtWrzQ2IO3M0ueccO88W2mme7xQQvBbMaGOhKkUPaP1NBBvbTJ44vjq0T
 jfYCpr7/SehSyxif39QbX5Vu3dxraNs6LuR9OBpGZxmB5kZ9Z285Z9w0B+RpGQ==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1619030293; a=rsa-sha256; cv=none;
 b=beWf3ohznUsMMnVr4xtbF/IGq2VEp3TgZGjg4CCuKCTzBfoe7DTFd+otOUliQPbcSA19DZ
 jxnUfenPowJEk7PyBsKtS3PY2hObyfPcEP+Bi03fYkDe4dT5klT0ax4PEeZruFyoxJRNwY
 QTI2yjXfcc9Vf/s+LdQHBcQrzbCJLaCeKujAyNijahz28IHwhGqR28T2XpJzNKNfW+OgTX
 uth8bDTVelsYZLdv2YioWwjKceby887zoj8lOVXLXGpiYERHdmte0jnQAWIK6owI6dc65u
 C9cLRfgsxPX3hlk83DDyB/MvSlPwWaONIKgMEEDb8g7zOrdsD5pyonE8thydeg==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-BeenThere: dev-commits-ports-all@freebsd.org
X-Mailman-Version: 2.1.34
Precedence: list
List-Id: Commit messages for all branches of the ports repository
 <dev-commits-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/dev-commits-ports-all/>
List-Post: <mailto:dev-commits-ports-all@freebsd.org>
List-Help: <mailto:dev-commits-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/dev-commits-ports-all>, 
 <mailto:dev-commits-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Apr 2021 18:38:13 -0000

Matthias Andree <mandree@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@FreeBSD.org>
>> AuthorDate: 2021-04-21 17:46:21 +0000
>> Commit:     Matthias Andree <mandree@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).