From 663f5244cacdd07abae24cfe844a98d60eaf0ac9 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Fri, 3 Jan 2025 15:25:15 +0000 Subject: [PATCH] Deploy script: Specify remote for new Preview branch (#22614) Set the git remote tracking branch when the new Preview branch is created by `script/bump-zed-minor-versions`. This only impacts the local git branch configuration of the user who runs this script. Release Notes: - N/A --- script/bump-zed-minor-versions | 1 + 1 file changed, 1 insertion(+) diff --git a/script/bump-zed-minor-versions b/script/bump-zed-minor-versions index b74d6fdda10764..ab381fe4564a86 100755 --- a/script/bump-zed-minor-versions +++ b/script/bump-zed-minor-versions @@ -77,6 +77,7 @@ 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} echo -n preview > crates/zed/RELEASE_CHANNEL git commit -q --all --message "${minor_branch_name} preview" git tag ${preview_tag_name}