From nobody Wed Feb 23 18:50:54 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 4022519D01B2; Wed, 23 Feb 2022 18:50:55 +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 4K3lVR1MT7z3k08; Wed, 23 Feb 2022 18:50:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645642255; 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=85SNEjLuyzlJ0FhffQMD399R5XM7skiml7iNn9IiAl4=; b=KEA3HRTVLWASRofBoYAZKtpnFoMWpkhzCupEKdeI0jTpgceFqhUJ0h/TgVWEedbwwCO7DU ip1QmemRhYELdilGldmcEGSj+bu/1wHRU8jvkOZkHkjUzDSWdPrKhvcFfGpzW67DT4VdJt ZCAlTNCjhlYCiCt7y+OP4jO96K63AyJzmdR15IMxBDkrm68OHLNZ6l2sFZEv3j84CUMlYn 2Y518aV8i5lx4IhB4fEG/mc7rghgDfT93lNx/l2s6W38HZeKGmjCAp+WiQXHVxnGEXrbzm NAklNDaCAxasj6rQZJHkaS2MX5wk0jboUx8OAa2/Yg8xiX8y6eJ621FMjR4WYQ== 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 0EA831D811; Wed, 23 Feb 2022 18:50:55 +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 21NIosRU078676; Wed, 23 Feb 2022 18:50:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21NIosBF078675; Wed, 23 Feb 2022 18:50:54 GMT (envelope-from git) Date: Wed, 23 Feb 2022 18:50:54 GMT Message-Id: <202202231850.21NIosBF078675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: ab7d09596958 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ab7d09596958791d20596b16b81a957495e4b370 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645642255; 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=85SNEjLuyzlJ0FhffQMD399R5XM7skiml7iNn9IiAl4=; b=tdvrX0WKKcvU6zErJM0wAs8d0/xTBv1rxxhuLwtJkjM0ATt899PKZc9ktNMVhj/1bsh7jU Y+rjntzWp1/1aZZyxdxgjx9l6XSxglF0MOLX31z2Cx3QO9sQD35LHw6cwXHcgG5Ty9bxEt htHrDUchVvgBWZll64roQBUkTSbtPVxkphxj0DP/5evQi5RnWogYrzrIAYhr1q7jGEL/so UiNPY7zFV6VssF8fDi5YP0AStJGV2Ve6ib4Sh+8cZqirDGbx8+DQo+PPgTIEM7ni1Jv0MC Bf0uzOHSJRdB28R8/XGD6xHV6CsYeQ9EffYrsZKZLqfJTMDSjlgYjpww2aMIHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645642255; a=rsa-sha256; cv=none; b=P9QdwFAH6zQVxeMyL51yGV4dTzLdUUjzmnISyzX7kV6uZLVXowZUIfCuygbCRqKlMW9ldR KOwB+2fKdfTjLUe4XDQBwPKKEMNc3taGWKCAGbGp8umAbugLmCJa9hU1ZZHV+hdCd79f/n ssyoN08KGADY7HbgKQg1wUWYSna81W2ddRVmnx71TwP6OMt05VFsFvTJmeqyH2+h7n7u5u hGU4jcVbO3f85NHFrhI+YlOFsRgr5t4ydAnh1k9xYnLD/Kl8sBpHaJnk6zdzJLKHP/U/7K Prb51iu7YPYmwcb76zYpkt1tQnsXFEApmN13wJNprnsWQb4ydom1LhubK1rwPA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=ab7d09596958791d20596b16b81a957495e4b370 commit ab7d09596958791d20596b16b81a957495e4b370 Author: Ed Maste AuthorDate: 2022-02-23 18:47:28 +0000 Commit: Ed Maste CommitDate: 2022-02-23 18:47:28 +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 --- 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 d54002e2c980..bb564acb317b 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: