[rtems-testing commit] release.sh: Correct comment for clean up
Joel Sherril
joel at rtems.org
Sun May 17 23:43:33 UTC 2015
Module: rtems-testing
Branch: master
Commit: d35599336be7f344b92e175f39a8352cd085ce40
Changeset: http://git.rtems.org/rtems-testing/commit/?id=d35599336be7f344b92e175f39a8352cd085ce40
Author: Joel Sherrill <joel.sherrill at oarcorp.com>
Date: Fri May 15 12:55:46 2015 -0500
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.
---
release-helpers/release.sh | 8 +++-----
1 file 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
}
More information about the vc
mailing list