summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYvan Roux <yvan.roux@linaro.org>2017-04-20 13:39:43 +0200
committerYvan Roux <yvan.roux@linaro.org>2017-04-20 13:39:43 +0200
commita24a21f8f7a07b74b1dfeb8ad2cb1429bebde6c5 (patch)
treec4c7ef3a3e2d31b9b92ebc0d323fce15323229b1
parent53c3cf226f395d7feec29a6445d7d0bcdc2f7589 (diff)
tcwg-release-tag.sh: Add cleaning on error.
Change-Id: I20111a96462ec4f4c1ed7effdd505c826f44ecd2
-rwxr-xr-xtcwg-release-tag.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/tcwg-release-tag.sh b/tcwg-release-tag.sh
index e966894..69517b3 100755
--- a/tcwg-release-tag.sh
+++ b/tcwg-release-tag.sh
@@ -781,11 +781,11 @@ 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}" || die "Couldn't push tag: ${release_tag}"
-git push ${REMOTE} "${local_branch}:${remote_mode_branch/remotes\/${REMOTE}/refs/heads}" || die "Couldn't push branch: ${local_branch}"
+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}"
if [[ "${SNAPSHOT:+set}" = "set" && "${SPIN:+set}" != "set" ]]; then
- git push ${REMOTE} "${local_int_branch}:${remote_int_branch/remotes\/${REMOTE}/refs/heads}" || die "Couldn't push branch: ${local_int_branch}"
+ 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