From ebc4688c2a4efce51a373f7233a4e59331b296f9 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Wed, 8 Jan 2025 15:59:30 +0000 Subject: [PATCH] Fix script/bump-zed-minor-versions. Revert #22834 Revert #22614 (#22837) Fixes an incorrect error message. Turns out it is impossible to set remote tracking to a branch that doesn't exist on the remote, so let's not even try. Reverts #22834 Reverts #22614 --- script/bump-zed-minor-versions | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/script/bump-zed-minor-versions b/script/bump-zed-minor-versions index cacea1598c..fa30530184 100755 --- a/script/bump-zed-minor-versions +++ b/script/bump-zed-minor-versions @@ -66,7 +66,7 @@ git checkout -q ${prev_minor_branch_name} git clean -q -dff stable_tag_name="v$(script/get-crate-version zed)" if git show-ref --quiet refs/tags/${stable_tag_name}; then - echo "tag ${preview_tag_name} already exists" + echo "tag ${stable_tag_name} already exists" exit 1 fi old_prev_minor_sha=$(git rev-parse HEAD) @@ -77,7 +77,6 @@ git tag ${stable_tag_name} echo "Creating new preview branch ${minor_branch_name}..." git checkout -q main git checkout -q -b ${minor_branch_name} -git branch --set-upstream-to=origin/${minor_branch_name} ${minor_branch_name} --no-advice echo -n preview > crates/zed/RELEASE_CHANNEL git commit -q --all --message "${minor_branch_name} preview" git tag ${preview_tag_name}