[5/5] misc/release-checklist.txt: Try to avoid wrong-tag mistakes

Commit Message

Ian Jackson April 12, 2017, 3:39 p.m. UTC

Add some better checking and make the runes a bit more robust.

Signed-off-by: Ian Jackson <[e-mail]>
---
 misc/release-checklist.txt | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Patch

diff --git a/misc/release-checklist.txt b/misc/release-checklist.txt
index f9e7e06..b96964e 100644
--- a/misc/release-checklist.txt
+++ b/misc/release-checklist.txt
@@ -28,18 +28,23 @@  t=RELEASE-$r
 
 # QEMU
 
-  git-checkout $s
-  git-tag -u 'Xen.org Xen tree code signing' -m "Xen $v" xen-$v $s
+  git checkout $s
+  git show # should show appropriate intended commit
+  git-tag -u 'Xen.org Xen tree code signing' -m "Xen $v" xen-$v
 
   git-push xenbits.xen.org:/home/xen/git/qemu-xen-traditional.git $s:stable-$x xen-$v
 
 # consider making tag in minios, and updating xen.git Config.mk
+  git checkout SOMETHING
+  git show # should show appropriate intended commit
   git-tag -u 'xen tree' -s -m "Xen $r$rc" xen-$t
   git push [e-mail]:/home/xen/git/mini-os.git xen-$t
 
 * Also tag upstream qemu tree (Stefano)
-    git tag -u 'xen tree' -s -m "Xen $r$rc" qemu-xen-$v SOMETHING
-    git push [e-mail]:/home/xen/git/qemu-xen.git qemu-xen-$v
+  git checkout SOMETHING
+  git show # should show appropriate intended commit
+  git tag -u 'xen tree' -s -m "Xen $r$rc" qemu-xen-$v 
+  git push [e-mail]:/home/xen/git/qemu-xen.git qemu-xen-$v
 
 * consider bumping sonames of shlibs