From: SaNeOr <sane0r@xxxxxxxxxxx>
bugfix: When using git-p4 in the python2 environment,
some places decode() missing an assignment.
Signed-off-by: W Sero <sane0r@xxxxxxxxxxx>
---
Fix git-p4 decode_path() missing an assignment
When using git-p4 in the python2 environment, some places decode( )
missing an assignment.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1683%2FSaNeOr%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1683/SaNeOr/master-v1
Pull-Request: https://github.com/git/git/pull/1683
git-p4.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/git-p4.py b/git-p4.py
index 28ab12c72b6..9fa4b9b104e 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -307,7 +307,7 @@ def decode_path(path):
return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path
else:
try:
- path.decode('ascii')
+ path = path.decode('ascii')
except:
path = path.decode(encoding, errors='replace')
if verbose:
@@ -3114,7 +3114,7 @@ def writeToGitStream(self, gitMode, relPath, contents):
def encodeWithUTF8(self, path):
try:
- path.decode('ascii')
+ path = path.decode('ascii')
except:
encoding = 'utf8'
if gitConfig('git-p4.pathEncoding'):
base-commit: 0f9d4d28b7e6021b7e6db192b7bf47bd3a0d0d1d
--
gitgitgadget
