You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2016/10/21 15:01:20 UTC
[26/44] isis git commit: ISIS-1465: further improvements to
interim-release.sh
ISIS-1465: further improvements to interim-release.sh
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c5a7b5e9
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c5a7b5e9
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c5a7b5e9
Branch: refs/heads/master
Commit: c5a7b5e97a9771d384ec3eb5995f2ef6fdf56b4b
Parents: 06d95ab
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Sep 27 16:17:58 2016 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Sep 27 16:17:58 2016 +0100
----------------------------------------------------------------------
interim-release.sh | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c5a7b5e9/interim-release.sh
----------------------------------------------------------------------
diff --git a/interim-release.sh b/interim-release.sh
index 34dacb8..337d7e7 100644
--- a/interim-release.sh
+++ b/interim-release.sh
@@ -12,13 +12,9 @@ DATE=`date +'%Y%m%d-%H%M'`
VERSION="$VERSION_BASE.$DATE"
BRANCH="interim/$VERSION"
-TAG="isis-$VERSION"
+TAG="interim/isis-$VERSION"
-echo "removing any earlier (local) 'interim' branches"
-for a in `git branch --list | grep interim`
-do
- git branch -D $a
-done
+CURR_BRANCH=`git rev-parse --abbrev-ref HEAD`
echo "checking out new branch $BRANCH"
git checkout -b "$BRANCH"
@@ -34,15 +30,11 @@ git commit -am "bumping to $VERSION"
echo "tagging"
git tag $TAG
-echo "removing any earlier remote branches"
-for a in `git ls-remote --heads $REMOTE | sed 's?.*refs/heads/??' | grep interim`
-do
- git push $REMOTE --delete $a
-done
-
echo "pushing tag"
git push $REMOTE $TAG
-echo "pushing branch"
-git push $REMOTE $BRANCH
+echo "switching back to original branch"
+git checkout $CURR_BRANCH
+echo "and deleting interim branch"
+git branch -D $BRANCH