d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ssh: add command to push tag to FREEBSD-upgrade instructions

Browse Source 
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
This commit is contained in:
Ed Maste 2022-02-23 13:47:28 -05:00
parent 2e6ec1e4fe
commit ab7d095969
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
crypto/openssh/FREEBSD-upgrade
View File

@ -42,9 +42,19 @@
At this point the vendor branch can be pushed to the FreeBSD repo via: At this point the vendor branch can be pushed to the FreeBSD repo via:
$ git push freebsd vendor/openssh $ 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 Note the second "git push" command is used to push the tag, which is
pushing now allows others to collaborate.) 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 08) Check out head and run the pre-merge script, which strips our RCS
tags from files that have them: tags from files that have them: