summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2015-05-15 12:55:46 -0500
committerJoel Sherrill <joel.sherrill@oarcorp.com>2015-05-17 17:50:39 -0500
commitd35599336be7f344b92e175f39a8352cd085ce40 (patch)
tree158d33594f0f39e4c0bbbe5165f5862d86b3e97c
parentc4ebcc12eefb4856d460e441086f1a767cdc0594 (diff)
downloadrtems-testing-d35599336be7f344b92e175f39a8352cd085ce40.tar.bz2
release.sh: Correct comment for clean up
The user will need to delete a branch, not necessarily the release branch. The release branch will exist in the upstream repository after a .0 release so deleting it is a bad idea.
-rwxr-xr-xrelease-helpers/release.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/release-helpers/release.sh b/release-helpers/release.sh
index 8181bf7..4f67721 100755
--- a/release-helpers/release.sh
+++ b/release-helpers/release.sh
@@ -64,10 +64,11 @@ EOF
if [ ${repo} != "NOT_SET" ] ; then
echo "An error has occurred and clean up may be needed. The following should"
echo "help identify what may need to be done for cleanup."
+ echo
+ echo " git checkout master"
+ echo " git branch -D @WORKING@"
if [ ${bump_dot_release} = "yes" ] ; then
- echo " git checkout master"
- echo " git branch -D ${MAJOR}"
echo " git tag -d ${VERSION}"
echo " rm -rf rtems-${VERSION}.tar.bz2 rtems-${VERSION}"
case ${repo} in
@@ -77,9 +78,6 @@ if [ ${repo} != "NOT_SET" ] ; then
echo " rtemsdocs-${VERSION}.tar.bz2 rtemsdocs-${VERSION}"
;;
esac
- else
- echo " git checkout master"
- echo " git branch -D @WORKING@"
fi
fi
}