tcwg-release-tag: Create tag and branches in-place for automation.

Change-Id: I24917d7c50ff3d2e5c7100d9c0e64bce970b905e

1 files changed, 8 insertions, 22 deletions

diff --git a/tcwg-release-tag.sh b/tcwg-release-tag.sh
index 69517b3..6fbea84 100755
--- a/tcwg-release-tag.sh
+++ b/tcwg-release-tag.sh
@@ -245,13 +245,6 @@ clean() {
 	git checkout ${save_branch} 2>&1>/dev/null
     fi
 
-    if [ -d "$REL_DIR/git" ]; then
-	rm -rf $REL_DIR/git
-	if [ $? -eq 0 ]; then
-	    print_info "Removed ${REL_DIR}/git"
-	fi
-    fi
-
     git_out=""
 
     # check to see if the local_branch has been created.
@@ -327,9 +320,9 @@ is_tag() {
 }
 
 changelog() {
-    echo "${SNAPSHOT:+Snapshot }${release}" > $REL_DIR/git/gcc/LINARO-VERSION
-    for cl in $(find $REL_DIR/git -name 'ChangeLog.linaro'); do
-	if [ x"$cl" = x"$REL_DIR/git/gcc/ChangeLog.linaro" ]; then
+    echo "${SNAPSHOT:+Snapshot }${release}" > $REL_DIR/gcc/LINARO-VERSION
+    for cl in $(find $REL_DIR -name 'ChangeLog.linaro'); do
+	if [ x"$cl" = x"$REL_DIR/gcc/ChangeLog.linaro" ]; then
 	    cat - $cl > $cl.new <<EOF
 $today  $NAME  <$EMAIL>
 
@@ -362,7 +355,7 @@ EOF
 
 bump_and_dev() {
     local bump_to="$1"
-    echo "${bump_to}" > $REL_DIR/git/gcc/LINARO-VERSION
+    echo "${bump_to}" > $REL_DIR/gcc/LINARO-VERSION
     git commit -q -a -F- <<EOF
 	gcc/
 	* LINARO-VERSION: Bump version number, post ${SNAPSHOT:+snapshot}${RELEASE:+release}${CANDIDATE:+release candidate}.
@@ -739,7 +732,7 @@ tagmsg=${commitmsg#Make }
 tagmsg=${tagmsg%.}
 release_tag="linaro-${rname}"
 
-REL_DIR="$PWD/../release/gcc-linaro-${rname}"
+REL_DIR="$PWD"
 
 
 # ==============================================================================
@@ -749,10 +742,6 @@ REL_DIR="$PWD/../release/gcc-linaro-${rname}"
 info
 echo -e "\n\n"
 
-print_info "${bold}Creating git work dir \"${REL_DIR}/git\"..."
-git-new-workdir $GIT_REPO $REL_DIR/git || die "Couldn't extract sources."
-pushd $REL_DIR/git 1>/dev/null
-
 print_info "${bold}Checking out branch \"${local_branch}\"..."
 git checkout -B ${local_branch} ${track} 2>/dev/null
 
@@ -781,12 +770,9 @@ print_info "${bold}Checking out branch \"${local_branch}\"..."
 git checkout ${local_branch} 1>/dev/null
 bump_and_dev "${bump_mode_to}"
 
-git push ${REMOTE} "${release_tag}" || clean_and_die "Couldn't push tag: ${release_tag}"
-git push ${REMOTE} "${local_branch}:${remote_mode_branch/remotes\/${REMOTE}/refs/heads}" || clean_and_die "Couldn't push branch: ${local_branch}"
+echo git push "${REMOTE} ${release_tag}" || clean_and_die "Couldn't push tag: ${release_tag}"
+echo git push "${REMOTE} ${local_branch}:${remote_mode_branch/remotes\/${REMOTE}/refs/heads}" || clean_and_die "Couldn't push branch: ${local_branch}"
 
 if [[ "${SNAPSHOT:+set}" = "set" && "${SPIN:+set}" != "set" ]]; then
-    git push ${REMOTE} "${local_int_branch}:${remote_int_branch/remotes\/${REMOTE}/refs/heads}" || clean_and_die "Couldn't push branch: ${local_int_branch}"
+    echo git push ${REMOTE} "${local_int_branch}:${remote_int_branch/remotes\/${REMOTE}/refs/heads}" || clean_and_die "Couldn't push branch: ${local_int_branch}"
 fi
-
-popd 1>/dev/null
-