diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:33:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-04 12:33:57 -0700 |
| commit | 0335b647a21d7940e1faeefa380c1411374a45a6 (patch) | |
| tree | 24d7be74e294ccf5f11ff87aab950373e4cd8779 /contrib | |
| parent | Merge branch 'mm/no-shell-escape-in-die-message' (diff) | |
| parent | remote-hg: fix path when cloning with tilde expansion (diff) | |
| download | tgif-0335b647a21d7940e1faeefa380c1411374a45a6.tar.xz | |
Merge branch 'ap/remote-hg-tilde-is-home-directory'
* ap/remote-hg-tilde-is-home-directory:
remote-hg: fix path when cloning with tilde expansion
Diffstat (limited to 'contrib')
| -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 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] |