summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hansen <rhansen@bbn.com>2013-11-17 23:12:42 -0500
committerJunio C Hamano <gitster@pobox.com>2013-11-27 12:09:50 -0800
commit5c1d2e8af99c1cf24a38fe830d96a4aedce30e2b (patch)
tree54afa76b9537fd627f2ae07ab4010b67fab5844d
parentbecb4336cb05c5ec456babaeafefa2e24ee85773 (diff)
downloadgit-5c1d2e8af99c1cf24a38fe830d96a4aedce30e2b.tar.gz
remote-hg: don't decode UTF-8 paths into Unicode objects
The internal mercurial API expects ordinary 8-bit string objects, not Unicode string objects. With this change, the test-hg.sh unit tests pass again. Signed-off-by: Richard Hansen <rhansen@bbn.com> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 85abbedb1c..1c713e0af1 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -725,7 +725,7 @@ def parse_commit(parser):
f = { 'deleted' : True }
else:
die('Unknown file command: %s' % line)
- path = c_style_unescape(path).decode('utf-8')
+ path = c_style_unescape(path)
files[path] = f
# only export the commits if we are on an internal proxy repo