fix: show only remote branches in deploy dropdown + bump to 0.4.0#4
Merged
Merged
Conversation
- Change git branch -a to git branch -r to list remote branches only - Filter out HEAD tracking refs (e.g. origin/HEAD) - Deduplicate branches after stripping origin/ prefix - Label dropdown 'Branch (remote)' for clarity PHP Deployer checks out branches on the remote server, so local-only branches cannot be deployed. Showing them was confusing and produced duplicates (e.g. local 'master' + remote 'origin/master' both appearing as 'master'). Co-Authored-By: Michael Sperber <michaelsperber01@gmail.com>
Contributor
Author
🤖 Devin AI EngineerI'll be helping with this pull request! Here's what you should know: ✅ I will automatically:
Note: I can only respond to comments from users who have write access to this repository. ⚙️ Control Options:
|
Co-Authored-By: Michael Sperber <michaelsperber01@gmail.com>
devin-ai-integration
Bot
changed the title
parse_remote_branches() now splits on the first '/' to strip the remote
name. Entries without '/' (e.g. bare 'origin' when git shortens
origin/HEAD) are automatically excluded by split_once().
This replaces the previous approach of using parse_git_output() +
trim_start_matches("origin/") which failed when %(refname:short)
shortened origin/HEAD to just 'origin'.
Co-Authored-By: Michael Sperber <michaelsperber01@gmail.com>
Co-Authored-By: Michael Sperber <michaelsperber01@gmail.com>
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
1 participant
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
Branch dropdown fix:
get_branches()usedgit branch -a(all), listing both local and remote branches. Afterparse_git_outputstripped theorigin/prefix, this produced duplicates (localmaster+ remoteorigin/master→ twomasterentries) and a strayorigin/HEAD→HEADentry.Since PHP Deployer's
--branch=Xcauses the remote server togit checkout Xfrom the remote repo, local-only branches are irrelevant and confusing.Changes:
git branch -a→git branch -ringet_branches()— only remote branches shownHEADtracking refs, deduplicate afterorigin/stripBranch (remote)for clarityVersion bump: 0.3.0 → 0.4.0 via
npm run bump(package.json, Cargo.toml, tauri.conf.json)Link to Devin session: https://app.devin.ai/sessions/d004a63fbbcc414388628b59cebe9aac
Requested by: @micksp