From 4cb870d8042bef3fdd953c633463eda24ce78f3d Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Mon, 21 Sep 2015 10:49:18 +0200 Subject: [PATCH] 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 Reviewed-by: Luke Diamand Signed-off-by: Junio C Hamano --- git-p4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4.py b/git-p4.py index 65feb22f58..603045050c 100755 --- a/git-p4.py +++ b/git-p4.py @@ -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) -- 2.11.4.GIT