зеркало из https://github.com/microsoft/git.git
git-p4: use replacement character for non UTF-8 characters in paths
If non UTF-8 characters are detected in paths then replace them with
a placeholder instead of throwing a UnicodeDecodeError
exception. This restores the original (implicit) implementation that
was broken in 00a9403
.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
Reviewed-by: Luke Diamand <luke@diamand.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
00a9403a10
Коммит
4cb870d804
|
@ -2219,7 +2219,7 @@ class P4Sync(Command, P4UserMap):
|
|||
encoding = 'utf8'
|
||||
if gitConfig('git-p4.pathEncoding'):
|
||||
encoding = gitConfig('git-p4.pathEncoding')
|
||||
relPath = relPath.decode(encoding).encode('utf8', 'replace')
|
||||
relPath = relPath.decode(encoding, 'replace').encode('utf8', 'replace')
|
||||
if self.verbose:
|
||||
print 'Path with non-ASCII characters detected. Used %s to encode: %s ' % (encoding, relPath)
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче