diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-11-25 08:20:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-25 08:20:02 -0800 |
| commit | c302941cd7670357bcd8209218e5f73c39e13d16 (patch) | |
| tree | 7c50b770dca13829104e846bfea57bfd89e8611d /contrib/remote-helpers/git-remote-hg | |
| parent | Git 1.8.5-rc3 (diff) | |
| parent | remote-hg: don't decode UTF-8 paths into Unicode objects (diff) | |
| download | tgif-c302941cd7670357bcd8209218e5f73c39e13d16.tar.xz | |
Merge branch 'rh/remote-hg-bzr-updates' (early part)
Unbreaks a recent breakage due to use of unquote-c-style.
This may need to be cherry-picked down to 1.8.4.x series.
* 'rh/remote-hg-bzr-updates' (early part):
remote-hg: don't decode UTF-8 paths into Unicode objects
Diffstat (limited to 'contrib/remote-helpers/git-remote-hg')
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 3222afd9da..c6026b9bed 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -747,7 +747,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 |