fix: editor command splitting and merge conflict detection#2
Open
sulthonzh wants to merge 1 commit into
Open
Conversation
- Fix editor spawn to handle commands with args (e.g. 'code --wait') Previously passed entire string as command, breaking multi-word editors - Fix isMergeInProgress to detect all unmerged status codes Only checked 'U' index, missing AA, DD, AU, DU, UD, UA states
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.
Fixes
1. Editor command with arguments breaks spawn
openInEditor()passed the entireEDITORstring as a single command tospawn(). Commands likecode --waitorsubl -w --new-windowwould fail becausespawn('code --wait', [file])tries to execute a binary literally named"code --wait".Fix: Split the editor string on whitespace, use first token as command and rest as initial args.
2. isMergeInProgress misses most conflict states
Only checked for index code
'U', but git uses many two-letter codes for unmerged entries:AA(both added),DD(both deleted),AU,DU,UD,UA.Fix: Check for any index code containing U, A, or D (the unmerged indicators).