The branch main has been updated by emaste:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ab7d09596958791d20596b16b81a957495e4b370
commit ab7d09596958791d20596b16b81a957495e4b370
Author: Ed Maste <ema...@freebsd.org>
AuthorDate: 2022-02-23 18:47:28 +0000
Commit: Ed Maste <ema...@freebsd.org>
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:
