fix: abort handles rebase/cherry-pick/revert, rebase context, regex edge case#3
Open
sulthonzh wants to merge 1 commit into
Open
fix: abort handles rebase/cherry-pick/revert, rebase context, regex edge case#3sulthonzh wants to merge 1 commit into
sulthonzh wants to merge 1 commit into
Conversation
…x edge case - abortMerge() now detects rebase-merge/rebase-apply, CHERRY_PICK_HEAD, and REVERT_HEAD to call the correct abort command instead of blindly running git merge --abort (which fails during rebase/cherry-pick) - getMergeInfo() detects rebase-merge state and reads head-name/message from .git/rebase-merge/ instead of only MERGE_MSG - countConflicts() regex changed from /<<<<<<<.+$/ to /<<<<<<<.*$/ to correctly count bare <<<<<<< markers without a branch name suffix
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.
abortMerge()only handles merge abortPreviously only ran
git merge --abort. During a rebase or cherry-pick, this would fail with an error instead of aborting the actual operation.Fix: Detect which operation is in progress by checking for:
rebase-merge/orrebase-apply/dirs →git rebase --abortCHERRY_PICK_HEAD→git cherry-pick --abortREVERT_HEAD→git revert --abortgit merge --abort2.
getMergeInfo()doesn't detect rebase stateOnly read
MERGE_MSGandMERGE_HEADwhich don't exist during a rebase. The--abortmessage would show nothing and--statuswouldn't show which branch is being rebased.Fix: Check for
rebase-merge/directory and readhead-name+messagefrom it.3.
countConflicts()regex misses bare markersRegex
/<<<<<<<.+\$/gmrequires at least one character after<<<<<<<. A bare<<<<<<<\n(no branch name) wouldn't be counted.Fix: Changed to
/<<<<<<<.*\$/gmto match zero or more characters.