From 3c3a56cd6b6d015cf70b24b0cff752445548f4c1 Mon Sep 17 00:00:00 2001 From: Mate Molnar Date: Thu, 17 Oct 2024 10:01:01 +0200 Subject: [PATCH] BUILD-6646 Fix updatevbranch.sh script to work for major updates --- scripts/updatevbranch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/updatevbranch.sh b/scripts/updatevbranch.sh index d227475..d5605bd 100755 --- a/scripts/updatevbranch.sh +++ b/scripts/updatevbranch.sh @@ -6,7 +6,7 @@ set -xeuo pipefail version=$1 vbranch="v${version%%.*}" git fetch --tags --all -git checkout "$vbranch" +git checkout -B "$vbranch" git update-ref -m "reset: update branch $vbranch to tag $version" "refs/heads/$vbranch" "$version" git push --force origin "$vbranch:refs/heads/$vbranch" || ( git show -s --pretty=format:'%h%d' "$vbranch" "origin/$vbranch" "$version"