From: Antoine Pelisse Date: Fri, 9 Aug 2013 17:13:07 +0000 (+0200) Subject: remote-hg: fix path when cloning with tilde expansion X-Git-Tag: v1.8.5-rc0~188^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33f66b25e1880db9d5b2f665b42d5e867d118b38;p=thirdparty%2Fgit.git remote-hg: fix path when cloning with tilde expansion The current code fixes the path to make it absolute when cloning, but doesn't consider tilde expansion, so that scenario fails throwing an exception because /home/myuser/~/my/repository doesn't exists: $ git clone hg::~/my/repository && cd repository && git fetch Expand the tilde when checking if the path is absolute, so that we don't fix a path that doesn't need to be. Signed-off-by: Antoine Pelisse Signed-off-by: Junio C Hamano --- diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 0194c67fb1..81ca001c3b 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -1124,7 +1124,7 @@ def do_option(parser): def fix_path(alias, repo, orig_url): url = urlparse.urlparse(orig_url, 'file') - if url.scheme != 'file' or os.path.isabs(url.path): + if url.scheme != 'file' or os.path.isabs(os.path.expanduser(url.path)): return abs_url = urlparse.urljoin("%s/" % os.getcwd(), orig_url) cmd = ['git', 'config', 'remote.%s.url' % alias, "hg::%s" % abs_url]