Fix error when merging files with unicode content.#505
Merged
jdavid merged 1 commit intolibgit2:masterfrom Mar 19, 2015
pks-t:fix-unicode-merge-conflicts
Merged
Fix error when merging files with unicode content.#505jdavid merged 1 commit intolibgit2:masterfrom pks-t:fix-unicode-merge-conflicts
jdavid merged 1 commit intolibgit2:masterfrom
pks-t:fix-unicode-merge-conflicts
Conversation
When merging index entries where the corresponding files contain Unicode codepoints an error is thrown. Decode the C string using UTF-8 to fix the issue and adjust the test case for merging files to contain umlauts to catch such errors.
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
2 participants
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.
When merging index entries where the corresponding files contain Unicode
codepoints an error is thrown. Decode the C string using UTF-8 to fix the issue
and adjust the test case for merging files to contain umlauts to catch such
errors.