From d125cd027fee341b3b3d65858a4121cf4931fead Mon Sep 17 00:00:00 2001
From: Onsi Fakhouri <onsijoe@gmail.com>
Date: Wed, 2 Jun 2021 12:20:44 -0600
Subject: [PATCH] v1.16.4

---
 CHANGELOG.md     |  5 +++++
 RELEASING.md     | 11 +++++++----
 config/config.go |  2 +-
 go.mod           |  2 ++
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ce4a082b..494abdbfb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.16.4
+
+### Fixes
+1.16.4 retracts 1.16.3.  There are no code changes.  The 1.16.3 tag was associated with the wrong commit and an attempt to change it after-the-fact has proven problematic.  1.16.4 retracts 1.16.3 in Ginkgo's go.mod and creates a new, correctly tagged, release.
+
 ## 1.16.3
 
 ### Features
diff --git a/RELEASING.md b/RELEASING.md
index 1e298c2da..db3d234c1 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -8,7 +8,10 @@ A Ginkgo release is a tagged git sha and a GitHub release.  To cut a release:
     - Fixes (fix version)
     - Maintenance (which in general should not be mentioned in `CHANGELOG.md` as they have no user impact)
 1. Update `VERSION` in `config/config.go`
-1. Create a commit with the version number as the commit message (e.g. `v1.3.0`)
-1. Tag the commit with the version number as the tag name (e.g. `v1.3.0`)
-1. Push the commit and tag to GitHub
-1. Create a new [GitHub release](https://help.github.com/articles/creating-releases/) with the version number as the tag  (e.g. `v1.3.0`).  List the key changes in the release notes.
+1. Commit, push, and release:
+  ```
+  git commit -m "vM.m.p"
+  git push
+  gh release create "vM.m.p"
+  git fetch --tags origin master
+  ```
\ No newline at end of file
diff --git a/config/config.go b/config/config.go
index 88ac2b2c9..5f3f43969 100644
--- a/config/config.go
+++ b/config/config.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 )
 
-const VERSION = "1.16.3"
+const VERSION = "1.16.4"
 
 type GinkgoConfigType struct {
 	RandomSeed         int64
diff --git a/go.mod b/go.mod
index 664372fb6..86a5a97be 100644
--- a/go.mod
+++ b/go.mod
@@ -9,3 +9,5 @@ require (
 	golang.org/x/sys v0.0.0-20210112080510-489259a85091
 	golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e
 )
+
+retract v1.16.3 // git tag accidentally associated with incorrect git commit