Avoids env var warning when path contains $/%; fix #832

rgkimball · Byron · commit 313b3b442501 · 2019-12-06T20:04:19.000+08:00
diff --git 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 @@ def __init__(self, path=None, odbt=GitCmdObjectDB, search_parent_directories=Fal
 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)

-Original file line number
+Diff line change
 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(.*)$')
 epath=epathorpathoros.getcwd()
 ifnotisinstance(epath, str):
 epath=str(epath)
 -ifexpand_varsand("%"inepathor"$"inepath):
 +ifexpand_varsandre.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)