Return-Path: X-Original-To: apmail-aurora-commits-archive@minotaur.apache.org Delivered-To: apmail-aurora-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 723B210987 for ; Tue, 25 Nov 2014 20:42:24 +0000 (UTC) Received: (qmail 84586 invoked by uid 500); 25 Nov 2014 20:42:24 -0000 Delivered-To: apmail-aurora-commits-archive@aurora.apache.org Received: (qmail 84550 invoked by uid 500); 25 Nov 2014 20:42:24 -0000 Mailing-List: contact commits-help@aurora.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aurora.incubator.apache.org Delivered-To: mailing list commits@aurora.incubator.apache.org Received: (qmail 84541 invoked by uid 99); 25 Nov 2014 20:42:24 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2014 20:42:24 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 25 Nov 2014 20:42:23 +0000 Received: (qmail 82779 invoked by uid 99); 25 Nov 2014 20:42:03 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Nov 2014 20:42:03 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id BC454A1A598; Tue, 25 Nov 2014 20:42:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wfarner@apache.org To: commits@aurora.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-aurora git commit: Disambiguate tag push from branch push in release script. Date: Tue, 25 Nov 2014 20:42:02 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-aurora Updated Branches: refs/heads/master 22dd64115 -> e95aa8ed7 Disambiguate tag push from branch push in release script. Reviewed at https://reviews.apache.org/r/28447/ Project: http://git-wip-us.apache.org/repos/asf/incubator-aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-aurora/commit/e95aa8ed Tree: http://git-wip-us.apache.org/repos/asf/incubator-aurora/tree/e95aa8ed Diff: http://git-wip-us.apache.org/repos/asf/incubator-aurora/diff/e95aa8ed Branch: refs/heads/master Commit: e95aa8ed710c18b0cfac573383c8eb055dfed389 Parents: 22dd641 Author: Bill Farner Authored: Tue Nov 25 12:41:17 2014 -0800 Committer: Bill Farner Committed: Tue Nov 25 12:41:17 2014 -0800 ---------------------------------------------------------------------- build-support/release/release | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-aurora/blob/e95aa8ed/build-support/release/release ---------------------------------------------------------------------- diff --git a/build-support/release/release b/build-support/release/release index a72c308..01a7b7f 100755 --- a/build-support/release/release +++ b/build-support/release/release @@ -137,7 +137,8 @@ if [[ $publish == 1 ]]; then git commit -m "Updating .auroraversion to release version ${current_version_tag}." git push origin "${current_version_tag}" git tag -s "${current_version_tag}" -m "Apache Aurora ${current_version_tag} release" ${current_version_tag} - git push origin "${current_version_tag}" + # Need to disambiguate here, since we already have a local branch ref named for the release. + git push origin "refs/tags/${current_version_tag}" fi dist_dir=${base_dir}/dist