From 7e47b97841bbfab1f42d206db0ef4ade25c26cf1 Mon Sep 17 00:00:00 2001
From: Alex Boten <aboten@lightstep.com>
Date: Wed, 27 May 2020 14:23:45 -0700
Subject: [PATCH] updating release markdown and script to fetch master

---
 RELEASING.md               | 4 +++-
 scripts/prepare_release.sh | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/RELEASING.md b/RELEASING.md
index d4749dedbeb..8b9abee354f 100644
--- a/RELEASING.md
+++ b/RELEASING.md
@@ -2,6 +2,7 @@
 This document explains how to publish all OT modules at version x.y.z. Ensure that you’re following semver when choosing a version number.
 
 Release Process:
+* [Checkout a clean repo](#checkout-a-clean-repo)
 * [Create a new branch](#create-a-new-branch)
 * [Open a Pull Request](#open-a-pull-request)
 * [Create a Release](#Create-a-Release)
@@ -10,6 +11,8 @@ Release Process:
 * [Check PyPI](#Check-PyPI)
 * [Troubleshooting](#troubleshooting)
 
+## Checkout a clean repo
+- To avoid pushing untracked changes, check out the repo in a new dir
 
 ## Create a new branch
 The following script does the following:
@@ -74,7 +77,6 @@ git commit -m
 
 If for some reason the action failed, do it manually:
 
-- To avoid pushing untracked changes, check out the repo in a new dir
 - Switch to the release branch (important so we don't publish packages with "dev" versions)
 - Build distributions with `./scripts/build.sh`
 - Delete distributions we don't want to push (e.g. `testutil`)
diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh
index bf8eb3e9615..a74bd17a8ab 100755
--- a/scripts/prepare_release.sh
+++ b/scripts/prepare_release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 #
 # This script:
 #   1. parses the version number from the branch name
@@ -73,6 +73,7 @@ function update_changelog() {
 }
 
 # create the release branch
+git fetch origin master
 git checkout master
 git reset --hard origin/master
 git checkout -b release/${VERSION}