summaryrefslogtreecommitdiff
path: root/git/util.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/util.py')
-rw-r--r--git/util.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/git/util.py b/git/util.py
index 39efdb1a..5baeee91 100644
--- a/git/util.py
+++ b/git/util.py
@@ -341,9 +341,12 @@ def finalize_process(proc, **kwargs):
proc.wait(**kwargs)
-def expand_path(p):
+def expand_path(p, expand_vars=True):
try:
- return osp.normpath(osp.abspath(osp.expandvars(osp.expanduser(p))))
+ p = osp.expanduser(p)
+ if expand_vars:
+ p = osp.expandvars(p)
+ return osp.normpath(osp.abspath(p))
except:
return None