Repository navigation
test(core): pin LC_ALL=C in gitLog test so conflict detection is locale-independent - #3706
Merged
Merged
Conversation
The merge step matches the literal 'CONFLICT' in git output, but localized git (e.g. LC_ALL=zh_CN) prints the localized word instead, making the test fail on non-English machines. Pin LC_ALL=C for that call so the assertion is locale-independent.
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.
The gitLog test suite drives a real git merge and matches the literal CONFLICT in its output. On machines with a localized git (e.g. LC_ALL=zh_CN, where the conflict marker prints as 「冲突」), the match fails and the test errors out even though the merge behaved exactly as expected. Pin LC_ALL=C for that call so the assertion is locale-independent. Verified failing on LC_ALL=zh_CN and passing with the fix.