From f84e704d99711335dad03c295dfe4c8ee397e126 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Wed, 6 May 2015 17:59:36 +1000 Subject: [PATCH] Retry simple push-to-master script --- script/ci/merge_branch_to_master.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/script/ci/merge_branch_to_master.sh b/script/ci/merge_branch_to_master.sh index 6a942c2d39..6e40ed4ef9 100755 --- a/script/ci/merge_branch_to_master.sh +++ b/script/ci/merge_branch_to_master.sh @@ -7,8 +7,4 @@ echo "--- Verifying branch is based on current master" exit_unless_master_merged echo "--- Pushing branch" -git checkout master -git merge origin/master -git merge origin/$BUILDKITE_BRANCH -git push origin master -git checkout origin/$BUILDKITE_BRANCH +git push origin $BUILDKITE_COMMIT:master