Repository navigation
fix: commit message not loaded after cherry-pick/revert with --no-commit - #2858
Merged
love-linger merged 2 commits intoNov 6, 2026
Merged
love-linger merged 2 commits into
love-linger merged 2 commits into
Conversation
Collaborator
|
Your PR has an issue. For example:
|
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.
Problem
Since 61e9fcc, the commit message box stays empty after
git cherry-pick -norgit revert -nwithout conflicts. These commands create no in-progress marker (CHERRY_PICK_HEAD/REVERT_HEAD), but git still writes the message to.git/MERGE_MSGfor a latergit commit.The refactor moved
LoadCommitMessageFromFile(MERGE_MSG)behind the_inProgressContext == nullearly return, so it is never read in this case.Fix
Try loading
MERGE_MSGinside the_inProgressContext == nullbranch before clearing the stale auto-loaded message. The clearing logic is preserved and only runs whenMERGE_MSGis absent or empty.