Fixed missing parameter and changed name

Author: Plazmaz

git/repo/base.py

@@ -51,11 +51,11 @@
 __all__= ('Repo',)
 
 
-def_expand_path(p, unsafe=True):
-ifunsafe:
-returnosp.normpath(osp.abspath(osp.expandvars(osp.expanduser(p))))
-else:
-returnosp.normpath(osp.abspath(osp.expanduser(p)))
+def_expand_path(p, expand_vars=True):
+p=osp.expanduser(p)
+ifexpand_vars:
+p=osp.expandvars(p)
+returnosp.normpath(osp.abspath(p))
 
 
 classRepo(object):
@@ -94,7 +94,7 @@ class Repo(object):
 # Subclasses may easily bring in their own custom types by placing a constructor or type here
 GitCommandWrapperType=Git
 
-def__init__(self, path=None, odbt=DefaultDBType, search_parent_directories=False, unsafe=True):
+def__init__(self, path=None, odbt=DefaultDBType, search_parent_directories=False, expand_vars=True):
 """Create a new Repo instance
 
  :param path:
@@ -120,15 +120,17 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
  :raise InvalidGitRepositoryError:
  :raise NoSuchPathError:
  :return: git.Repo """
+
 epath=pathoros.getenv('GIT_DIR')
 ifnotepath:
 epath=os.getcwd()
 ifGit.is_cygwin():
 epath=decygpath(epath)
-ifunsafeand ("%"inepathor"$"inepath):
-warnings.warn("The use of environment variables in paths is deprecated"
-+"\nfor security reasons and may be removed in the future!!")
-epath=_expand_path(epathorpathoros.getcwd(), unsafe)
+epath=epathorpathoros.getcwd()
+ifexpand_varsand ("%"inepathor"$"inepath):
+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)
 ifnotos.path.exists(epath):
 raiseNoSuchPathError(epath)
 
@@ -155,7 +157,7 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
 sm_gitpath=find_worktree_git_dir(dotgit)
 
 ifsm_gitpathisnotNone:
-self.git_dir=_expand_path(sm_gitpath, unsafe)
+self.git_dir=_expand_path(sm_gitpath, expand_vars)
 self._working_tree_dir=curpath
 break
 
@@ -851,7 +853,7 @@ def blame(self, rev, file, incremental=False, **kwargs):
 returnblames
 
 @classmethod
-definit(cls, path=None, mkdir=True, odbt=DefaultDBType, **kwargs):
+definit(cls, path=None, mkdir=True, odbt=DefaultDBType, expand_vars=True, **kwargs):
 """Initialize a git repository at the given path if specified
 
  :param path:
@@ -869,7 +871,7 @@ def init(cls, path=None, mkdir=True, odbt=DefaultDBType, **kwargs):
  the directory containing the database objects, i.e. .git/objects.
  It will be used to access all object data
 
- :param unsafe:
+ :param expand_vars:
  if specified, environment variables will not be escaped. This
  can lead to information disclosure, allowing attackers to
  access the contents of environment variables
@@ -879,7 +881,7 @@ def init(cls, path=None, mkdir=True, odbt=DefaultDBType, **kwargs):
 
  :return: ``git.Repo`` (the newly created repo)"""
 ifpath:
-path=_expand_path(path, unsafe)
+path=_expand_path(path, expand_vars)
 ifmkdirandpathandnotosp.exists(path):
 os.makedirs(path, 0o755)