From nobody Thu Oct 20 20:35:30 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MtfVp447Mz4gW2V; Thu, 20 Oct 2022 20:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MtfVp3Mtrz3P0k; Thu, 20 Oct 2022 20:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666298130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mjbhv6lImyqHl6W53d6iQJVL6TUJBnGqZ6c8bZXEdiY=; b=yHicd3zYJkx94lS8zOskbB5Ur/pfBdYvYBUX6RtJ7+QToRhFIX8OPNAq+wWtqRK4MCkxWc fzbAcInJ0rsjfBU1Ng0t5tpsJDP6uIDJL3N63d8UGaiPZqF4q2aAA6mma4x9usWqkzmIj1 vb2FsSiFKOfyM3R3zvgWlAvZNF98L/bh/rE16TjszEnc+/mO1cYkP7JQ9kpCs1D/VuzEKK +ZqveO60pq63i0LA13W5vh09DuNfK3YNm7Eg4nihKJTpRkG9JgbpZhq724KylELcQZK1tT o5Ws9BzVeg4Ey13t1dryYiWLG9JYVD94Z+sHOsmH4yEaItzqOZRzV6dg00HspA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MtfVp2RJLz103p; Thu, 20 Oct 2022 20:35:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29KKZU5m002477; Thu, 20 Oct 2022 20:35:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29KKZUOr002476; Thu, 20 Oct 2022 20:35:30 GMT (envelope-from git) Date: Thu, 20 Oct 2022 20:35:30 GMT Message-Id: <202210202035.29KKZUOr002476@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 2bd6514a1646 - stable/13 - ssh: add command to push tag to FREEBSD-upgrade instructions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2bd6514a16465a98481f232437fea0ae834da519 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666298130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mjbhv6lImyqHl6W53d6iQJVL6TUJBnGqZ6c8bZXEdiY=; b=F3cH1skG1JEQscy93OtkmyAWoEN3YcxR+op3DjQ3uYXyV9HI0JcDkZ3H+xIVYWHYRBoJOS CtMu8U2WdV/MTSYgelfJKGN/TRU7MTnQ6ldUaCV/MatgkT16kS8T0Vl7Q0upOTf1ru1EkO 1dCaEKjM9KV9qotITL7iiSocLDkcYJf11YlQbDiikiIFIFMu9Yc6IU/d6x/rQaInIVBKVW wMRpKDNJkFYMYET5+jwo6dyiwC7IflZXrvEzUkHfqBbUwJ+ZGiWDhCR/wKO6E8lTOjFw55 P17SZsC7Hndvvjj72Ji1c0nzhdezv5j2ep7plx8aQwPDQZ2Gj0gEwrX9IRTPZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666298130; a=rsa-sha256; cv=none; b=E/TqsQjUtf0wZxJneVpl3Zxghjc++cabVEybpyvTPON3Oc8cY36ibPt4Qkv3mHcew0tVuD eG569agPY8S5ytW1K8WPgjujB7e5Pv8riXK2msdrn8RwEchTF8fa01NEbSTuWiwOoqLIMa pzzDT+C5GljSqmvunJXQBbyXII9gG9+nRzAP2iZ55zPsgvewYqHXZUu0tx0Sr7u8pzHemy jEItodX+bBlUnBdP8SUrrm0PDbLtopih2tZkihmgM9qR+KBrWOUFNooAKiapSHdTCzDnrf lU8UuQbbmo7po8LPiZ0Ndg8hc4ll9+SauzOXd3ytP/IvcAR6XKhX5ioaghrNNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2bd6514a16465a98481f232437fea0ae834da519 commit 2bd6514a16465a98481f232437fea0ae834da519 Author: Ed Maste AuthorDate: 2022-02-23 18:47:28 +0000 Commit: Ed Maste CommitDate: 2022-10-20 20:34:21 +0000 ssh: add command to push tag to FREEBSD-upgrade instructions Because it appears `git push --follow-tags` may push extra, undesired tags document both techniques (pushing the specific vendor/openssh/X.YpZ tag and pushing all with --follow-tags, using --dry-run first). Discussed with: imp, lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D33605 (cherry picked from commit ab7d09596958791d20596b16b81a957495e4b370) --- crypto/openssh/FREEBSD-upgrade | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 3045cc3263b6..c9a0fa7fe1c4 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -42,9 +42,19 @@ At this point the vendor branch can be pushed to the FreeBSD repo via: $ git push freebsd vendor/openssh + $ git push freebsd vendor/openssh/X.YpZ - (It could also be pushed later on, along with the merge to main, but - pushing now allows others to collaborate.) + Note the second "git push" command is used to push the tag, which is + not pushed by default. + + It is also possible to push the branch and tag together, but use + --dry-run first to ensure that no undesired tags will be pushed: + + $ git push --dry-run --follow-tags freebsd vendor/openssh + $ git push --follow-tags freebsd vendor/openssh + + The update and tag could instead be pushed later, along with the merge + to main, but pushing now allows others to collaborate. 08) Check out head and run the pre-merge script, which strips our RCS tags from files that have them: