git reset

elastic · Jan 23, 2024 · 569ac13 · 569ac13
1 parent af3802d
commit 569ac13
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/scripts/bump_cloudbeat.sh b/scripts/bump_cloudbeat.sh
@@ -18,13 +18,18 @@ create_release_branch() {
     echo "• Release branch '$CURRENT_MINOR_VERSION' already exists, not creating a new one from main"
   else
     echo "• Create and push a new release branch $CURRENT_MINOR_VERSION from main"
+    git checkout -b "$CURRENT_MINOR_VERSION"
     git fetch origin main
-    git checkout main
-    git pull --rebase origin main
-    git checkout -b "$CURRENT_MINOR_VERSION" origin/main
-    git log --merges --oneline --pretty=format:"%h %an %ad %s" --date=format-local:"%d/%m/%H:%M"
+    git reset --hard origin/main
     echo "Push release branch $CURRENT_MINOR_VERSION to origin"
     git push origin $CURRENT_MINOR_VERSION
+
+    # git checkout main
+    # git pull --rebase origin main
+    # git checkout -b "$CURRENT_MINOR_VERSION" origin/main
+    # git log --merges --oneline --pretty=format:"%h %an %ad %s" --date=format-local:"%d/%m/%H:%M"
+    # echo "Push release branch $CURRENT_MINOR_VERSION to origin"
+    # git push origin $CURRENT_MINOR_VERSION
   fi
 }