From d742080d1d0e1d341597d07dd10ed76b942e11db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucas=20K=C3=A4ldstr=C3=B6m?= <lucas@weave.works>
Date: Tue, 6 Aug 2019 21:13:27 +0300
Subject: [PATCH] Force-push the tags, and add extra newline

---
 hack/minor-release.sh  | 4 ++--
 hack/patch-release.sh  | 4 ++--
 hack/release-common.sh | 7 +++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/hack/minor-release.sh b/hack/minor-release.sh
index 134d28a41..1be96b62d 100755
--- a/hack/minor-release.sh
+++ b/hack/minor-release.sh
@@ -46,13 +46,13 @@ push_artifacts() {
         cat <<- EOF
 		Done! Next, do this:
 
-		git push upstream --tags
+		git push upstream --tags -f
 		git push upstream ${RELEASE_BRANCH}
 		git push upstream master
 		EOF
         exit 1
     fi
-    git push upstream --tags
+    git push upstream --tags -f
     git push upstream ${RELEASE_BRANCH}
     git push upstream master
 }
diff --git a/hack/patch-release.sh b/hack/patch-release.sh
index b83b44258..619b727e1 100755
--- a/hack/patch-release.sh
+++ b/hack/patch-release.sh
@@ -54,12 +54,12 @@ push_artifacts() {
         cat <<- EOF
 		Done! Next, do this:
 
-		git push upstream --tags
+		git push upstream --tags -f
 		git push upstream ${RELEASE_BRANCH}
 		EOF
         exit 1
     fi
-    git push upstream --tags
+    git push upstream --tags -f
     git push upstream ${RELEASE_BRANCH}
 }
 
diff --git a/hack/release-common.sh b/hack/release-common.sh
index 4a47f63b4..8d74a0981 100644
--- a/hack/release-common.sh
+++ b/hack/release-common.sh
@@ -45,11 +45,14 @@ write_changelog() {
     # Generate the changelog draft
     if [[ ! -f docs/releases/${FULL_VERSION}.md ]]; then
         # Push the tag provisionally, we'll later update it
-        git tag ${FULL_VERSION}
-        git push upstream --tags
+        echo "Tagging the current commit ${FULL_VERSION} temporarily in order to run gren..."
+        git tag -f ${FULL_VERSION}
+        git push upstream --tags -f
 
         run_gren "changelog --generate"
         mv docs/releases/next.md docs/releases/${FULL_VERSION}.md
+        # Add an extra newline in the end of the changelog
+        echo "" >> docs/releases/${FULL_VERSION}.md
     fi
 
     read -p "Please manually fixup the changelog file now. Continue? [y/N] " confirm