summaryrefslogtreecommitdiff
path: root/git/repo/base.py
diff options
context:
space:
mode:
Diffstat (limited to 'git/repo/base.py')
-rw-r--r--git/repo/base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/git/repo/base.py b/git/repo/base.py
index 106ed2eb..05c55edd 100644
--- a/git/repo/base.py
+++ b/git/repo/base.py
@@ -77,6 +77,7 @@ class Repo(object):
re_whitespace = re.compile(r'\s+')
re_hexsha_only = re.compile('^[0-9A-Fa-f]{40}$')
re_hexsha_shortened = re.compile('^[0-9A-Fa-f]{4,40}$')
+ re_envvars = re.compile(r'(\$(\{\s?)?[a-zA-Z_]\w*(\}\s?)?|%\s?[a-zA-Z_]\w*\s?%)')
re_author_committer_start = re.compile(r'^(author|committer)')
re_tab_full_line = re.compile(r'^\t(.*)$')
@@ -125,7 +126,7 @@ class Repo(object):
epath = epath or path or os.getcwd()
if not isinstance(epath, str):
epath = str(epath)
- if expand_vars and ("%" in epath or "$" in epath):
+ if expand_vars and re.search(self.re_envvars, epath):
warnings.warn("The use of environment variables in paths is deprecated" +
"\nfor security reasons and may be removed in the future!!")
epath = expand_path(epath, expand_vars)