chore: track origin EE branch in worktree setup when absent locally#9504
Draft
hugocasa wants to merge 1 commit into
Draft
chore: track origin EE branch in worktree setup when absent locally#9504hugocasa wants to merge 1 commit into
hugocasa wants to merge 1 commit into
Conversation
Deploying windmill with
|
| Latest commit: |
8129616
|
| Status: | ✅ Deploy successful! |
| Preview URL: | https://1ca4bc5d.windmill.pages.dev |
| Branch Preview URL: | https://chore-ee-worktree-track-remo.windmill.pages.dev |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Improves
wm_setup_ee_worktreeinscripts/worktree-common.shso that when the current branch's matching EE branch exists onoriginbut isn't checked out locally in the EE repo, the worktree tracksorigin/<branch>instead of silently branching offmainand dropping the EE-side work already pushed to the remote.Changes
elifarm that, when no matching local branch exists, checks forrefs/remotes/origin/<branch>viagit show-refand creates the worktree on a new local branch trackingorigin/<branch>.Test plan
originonly (no local EE branch): setup prints "Created EE worktree ... (tracking origin/)" andgit -C <worktree> rev-parse --abbrev-ref @{u}reportsorigin/<branch>mainSummary by cubic
Prevents EE worktrees from branching off
mainwhen a matching branch exists only onorigin.wm_setup_ee_worktreenow creates a local branch that tracksorigin/<branch>to keep remote EE work intact.origin/<branch>does, create the worktree on a new local branch trackingorigin/<branch>.origin/<branch>, and new branch frommain.Written for commit 8129616. Summary will update on new commits.