Skip to content

Commit a1fc464

Browse files
committed
dev/release.sh: improve instruction for pushing the tag
'git push --follow-tags' does a little too much, any spurious tag object that the releaser have in their local repository will come along, even though they have nothing to do with the commits being pushed. Therefore, we modify the instructions to show a separate and explicit push of the release tag. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from openssl#13159)
1 parent b40498c commit a1fc464

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

dev/release.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,10 +556,12 @@ Push them to github, make PRs from them and have them approved:
556556
557557
When merging them into the main repository, do it like this:
558558
559-
git push --follow-tags openssl-git@git.openssl.org:openssl.git \\
559+
git push openssl-git@git.openssl.org:openssl.git \\
560560
$tmp_release_branch:$release_branch
561561
git push openssl-git@git.openssl.org:openssl.git \\
562562
$tmp_update_branch:$update_branch
563+
git push openssl-git@git.openssl.org:openssl.git \\
564+
$tag
563565
EOF
564566
else
565567
cat <<EOF
@@ -570,8 +572,10 @@ Push it to github, make a PR from it and have it approved:
570572
571573
When merging it into the main repository, do it like this:
572574
573-
git push --follow-tags openssl-git@git.openssl.org:openssl.git \\
575+
git push openssl-git@git.openssl.org:openssl.git \\
574576
$tmp_release_branch:$release_branch
577+
git push openssl-git@git.openssl.org:openssl.git \\
578+
$tag
575579
EOF
576580
fi
577581

0 commit comments

Comments
 (0)