From: Richard Levitte <levitte@openssl.org>
Date: Fri, 16 Oct 2020 08:24:18 +0000 (+0200)
Subject: dev/release.sh: improve instruction for pushing the tag
X-Git-Tag: openssl-3.0.0-alpha8~58
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1fc4642e1cedbce54945da36d256bbb12ff752d;p=thirdparty%2Fopenssl.git

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 https://github.com/openssl/openssl/pull/13159)
---

diff --git a/dev/release.sh b/dev/release.sh
index 98fdd6a5801..be8c89bb69d 100755
--- a/dev/release.sh
+++ b/dev/release.sh
@@ -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
@@ -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