From ef0ec7b3cb71913aeb7498cafdbb4947734743b2 Mon Sep 17 00:00:00 2001
From: Bastian Doetsch <bastian.doetsch@snyk.io>
Date: Thu, 20 Jun 2024 13:45:45 +0200
Subject: [PATCH] fix: move upgrade down to reuse commits

---
 .github/create-cli-pr.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/create-cli-pr.sh b/.github/create-cli-pr.sh
index 787a55a4c..7de8cb7fd 100755
--- a/.github/create-cli-pr.sh
+++ b/.github/create-cli-pr.sh
@@ -25,12 +25,13 @@ popd
 
 WHAT_CHANGED=$(git whatchanged "$LS_COMMIT_HASH"...HEAD)
 BODY=$(printf "## Changes since last integration of Language Server\n\n\`\`\`\n%s\n\`\`\`" "$WHAT_CHANGED")
+BRANCH=feat/automatic-upgrade-of-ls
 
 pushd $CLI_DIR
+  git checkout $BRANCH || git checkout -b $BRANCH
+
   UPGRADE=$(go run scripts/upgrade-snyk-go-dependencies.go --name=snyk-ls)
   LS_VERSION=$(echo $UPGRADE | sed 's/.*Sha: \(.*\) URL.*/\1/')
-  BRANCH=feat/automatic-upgrade-of-ls
-  git checkout $BRANCH || git checkout -b $BRANCH
 
   git config --global user.email "team-ide@snyk.io"
   git config --global user.name "Snyk Team IDE"