Fix 3954 quotes in merge commit message #8042
Merged
Conversation
This file contains 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
Fixes #3954 Centralise commiit message handling by moving the code from `FormCommit` that formatted and wrote a commit message into a temp file before a git command was run to `CommitMessageManager`. Leverage the same implementation for `FormMergeBranch` to write out merge-commit messages. Add tests.
ghost
assigned 
Codecov Report
@@ Coverage Diff @@
## master #8042 +/- ##
=======================================
Coverage 49.60% 49.60%
=======================================
Files 844 844
Lines 60849 60861 +12
Branches 10877 10891 +14
=======================================
+ Hits 30185 30192 +7
- Misses 28448 28452 +4
- Partials 2216 2217 +1
|
|
@msftbot merge in 25 hours |
|
Hello @RussKie! Because you've given me some instructions on how to help merge this pull request, I'll be modifying my merge approach. Here's how I understand your requirements for merging this pull request:
If this doesn't seem right to you, you can tell me to cancel these instructions and use the auto-merge policy that has been configured for this repository. Try telling me "forget everything I just told you". |
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.
Fixes #3954
This work is inspired by #7796 that was abandoned by its author.
Proposed changes
FormCommitthat formatted and wrote a commit message into a temp file before a git command was run toCommitMessageManager.Leverage the same implementation for
FormMergeBranchto write out merge-commit messages.Screenshots
Before
Merge commit message with quotes was failing the merge
test "message text" testAfter
The merge succeeds.
Test methodology