Skip to content

Commit

Permalink
dev/release.sh: improve instruction for pushing the tag
Browse files Browse the repository at this point in the history
'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)
  • Loading branch information
levitte committed Oct 17, 2020
1 parent b40498c commit a1fc464
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions dev/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -556,10 +556,12 @@ Push them to github, make PRs from them and have them approved:
When merging them into the main repository, do it like this:
git push --follow-tags openssl-git@git.openssl.org:openssl.git \\
git push openssl-git@git.openssl.org:openssl.git \\
$tmp_release_branch:$release_branch
git push openssl-git@git.openssl.org:openssl.git \\
$tmp_update_branch:$update_branch
git push openssl-git@git.openssl.org:openssl.git \\
$tag
EOF
else
cat <<EOF
Expand All @@ -570,8 +572,10 @@ Push it to github, make a PR from it and have it approved:
When merging it into the main repository, do it like this:
git push --follow-tags openssl-git@git.openssl.org:openssl.git \\
git push openssl-git@git.openssl.org:openssl.git \\
$tmp_release_branch:$release_branch
git push openssl-git@git.openssl.org:openssl.git \\
$tag
EOF
fi

Expand Down

0 comments on commit a1fc464

Please sign in to comment.