[3/5] wicket git commit: Also clean up staging area before building release

[da...@apache.org]

Also clean up staging area before building release


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7e607ffa
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7e607ffa
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7e607ffa

Branch: refs/heads/master
Commit: 7e607ffa25a06196298ac6f9fc804a916a9fb20a
Parents: d937d36
Author: Martijn Dashorst <da...@apache.org>
Authored: Fri Jul 10 09:18:00 2015 +0200
Committer: Martijn Dashorst <da...@apache.org>
Committed: Fri Jul 10 09:18:00 2015 +0200

----------------------------------------------------------------------
 release-dashorst.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/7e607ffa/release-dashorst.sh
----------------------------------------------------------------------
diff --git a/release-dashorst.sh b/release-dashorst.sh
index 4a1c85c..3bee295 100755
--- a/release-dashorst.sh
+++ b/release-dashorst.sh
@@ -423,14 +423,20 @@ echo "Ensuring we are starting from wicket-$major_version.x"
 git checkout $GIT_BRANCH
 
 echo "Removing previous release tag $tag (if exists)"
-oldtag=`git tag -l |grep -e "$tag"|wc -l`
-[ "$oldtag" -ne 0 ] && git tag -d $tag
+oldtag=`git tag -l |grep -e "$tag"|wc -l` >> release.out
+[ "$oldtag" -ne 0 ] && git tag -d $tag >> release.out
 
 echo "Removing previous build branch $branch (if exists)"
-oldbranch=`git branch |grep -e "$branch"|wc -l`
-[ "$oldbranch" -ne 0 ] && git branch -D $branch
+oldbranch=`git branch |grep -e "$branch"|wc -l` >> release.out
+[ "$oldbranch" -ne 0 ] && git branch -D $branch >> release.out
 
-git checkout -b $branch
+echo "Removing previous staging branch (if exists)"
+git push staging --delete refs/heads/$branch >> release.out
+git push staging --delete $tag >> release.out
+
+
+echo "Creating release branch"
+git checkout -b $branch >> release.out
 
 # Clear the current NOTICE.txt file
 echo "Creating notice file."