From 0b75e4d9183bf26a89a68d5423b794aecdf822b2 Mon Sep 17 00:00:00 2001
From: Yuming Wang <yumwang@ebay.com>
Date: Fri, 13 Dec 2019 17:16:04 +0800
Subject: [PATCH 1/2] Do not add commits when releasing preview version

---
 dev/create-release/release-tag.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/dev/create-release/release-tag.sh b/dev/create-release/release-tag.sh
index 8024440759eb..deb24890ef94 100755
--- a/dev/create-release/release-tag.sh
+++ b/dev/create-release/release-tag.sh
@@ -71,6 +71,11 @@ cd spark
 git config user.name "$GIT_NAME"
 git config user.email $GIT_EMAIL
 
+if [[ $RELEASE_VERSION == *"preview"* ]]; then
+  echo "It's preview release. Will create a preview branch for this release."
+  git checkout -b preview-release
+fi
+
 # Create release version
 $MVN versions:set -DnewVersion=$RELEASE_VERSION | grep -v "no value" # silence logs
 # Set the release version in R/pkg/DESCRIPTION
@@ -104,7 +109,9 @@ git commit -a -m "Preparing development version $NEXT_VERSION"
 if ! is_dry_run; then
   # Push changes
   git push origin $RELEASE_TAG
-  git push origin HEAD:$GIT_BRANCH
+  if [[ $RELEASE_VERSION != *"preview"* ]]; then
+    git push origin HEAD:$GIT_BRANCH
+  fi
 
   cd ..
   rm -rf spark

From c7cd6f93d92aa440a206d73e4470904899607ad2 Mon Sep 17 00:00:00 2001
From: Yuming Wang <yumwang@ebay.com>
Date: Sun, 15 Dec 2019 12:20:48 +0800
Subject: [PATCH 2/2] Fix

---
 dev/create-release/release-tag.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dev/create-release/release-tag.sh b/dev/create-release/release-tag.sh
index deb24890ef94..f8b730b06136 100755
--- a/dev/create-release/release-tag.sh
+++ b/dev/create-release/release-tag.sh
@@ -71,11 +71,6 @@ cd spark
 git config user.name "$GIT_NAME"
 git config user.email $GIT_EMAIL
 
-if [[ $RELEASE_VERSION == *"preview"* ]]; then
-  echo "It's preview release. Will create a preview branch for this release."
-  git checkout -b preview-release
-fi
-
 # Create release version
 $MVN versions:set -DnewVersion=$RELEASE_VERSION | grep -v "no value" # silence logs
 # Set the release version in R/pkg/DESCRIPTION
@@ -111,6 +106,8 @@ if ! is_dry_run; then
   git push origin $RELEASE_TAG
   if [[ $RELEASE_VERSION != *"preview"* ]]; then
     git push origin HEAD:$GIT_BRANCH
+  else
+    echo "It's preview release. We only push $RELEASE_TAG to remote."
   fi
 
   cd ..