Sep 28, 2017 · Aug 21, 2017 · Aug 21, 2017
diff --git a/git/repo/base.py b/git/repo/base.py
 import os
 import re
 import sys
 import warnings

 from git.cmd import (
    Git,
 __all__ = ('Repo',)


 def _expand_path(p):
    return osp.normpath(osp.abspath(osp.expandvars(osp.expanduser(p))))
 def _expand_path(p, expand_vars=True):
    p = osp.expanduser(p)
    if expand_vars:
        p = osp.expandvars(p)
    return osp.normpath(osp.abspath(p))


 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):
    def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=False, expand_vars=True):
        """Create a new Repo instance

        :param path:
        :raise InvalidGitRepositoryError:
        :raise NoSuchPathError:
        :return: git.Repo """

        epath = path or os.getenv('GIT_DIR')
        if not epath:
            epath = os.getcwd()
        if Git.is_cygwin():
            epath = decygpath(epath)
        epath = _expand_path(epath or path or os.getcwd())
        epath = epath or path or os.getcwd()
        if expand_vars and ("%" in epath or "$" in 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)
        if not os.path.exists(epath):
            raise NoSuchPathError(epath)

                sm_gitpath = find_worktree_git_dir(dotgit)

            if sm_gitpath is not None:
                self.git_dir = _expand_path(sm_gitpath)
                self.git_dir = _expand_path(sm_gitpath, expand_vars)
                self._working_tree_dir = curpath
                break

        return blames

    @classmethod
    def init(cls, path=None, mkdir=True, odbt=DefaultDBType, **kwargs):
    def init(cls, path=None, mkdir=True, odbt=DefaultDBType,expand_vars=True,**kwargs):
        """Initialize a git repository at the given path if specified

        :param path:
            the directory containing the database objects, i.e. .git/objects.
            It will be used to access all object data

        :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

        :parm kwargs:
            keyword arguments serving as additional options to the git-init command

        :return: ``git.Repo`` (the newly created repo)"""
        if path:
            path = _expand_path(path)
            path = _expand_path(path, expand_vars)
        if mkdir and path and not osp.exists(path):
            os.makedirs(path, 0o755)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,6 +9,7 @@
		import os
		import re
		import sys
		import warnings

		from git.cmd import (
		Git,
Expand DownExpand Up		@@ -50,8 +51,11 @@
		__all__ = ('Repo',)


		def _expand_path(p):
		return osp.normpath(osp.abspath(osp.expandvars(osp.expanduser(p))))
		def _expand_path(p, expand_vars=True):
		p = osp.expanduser(p)
		if expand_vars:
		p = osp.expandvars(p)
		return osp.normpath(osp.abspath(p))


		class Repo(object):
Expand DownExpand Up		@@ -90,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):
		def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=False, expand_vars=True):
		"""Create a new Repo instance

		:param path:
Expand All		@@ -116,12 +120,17 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
		:raise InvalidGitRepositoryError:
		:raise NoSuchPathError:
		:return: git.Repo """

		epath = path or os.getenv('GIT_DIR')
		if not epath:
		epath = os.getcwd()
		if Git.is_cygwin():
		epath = decygpath(epath)
		epath = _expand_path(epath or path or os.getcwd())
		epath = epath or path or os.getcwd()
		if expand_vars and ("%" in epath or "$" in 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)
		if not os.path.exists(epath):
		raise NoSuchPathError(epath)

Expand All		@@ -148,7 +157,7 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals
		sm_gitpath = find_worktree_git_dir(dotgit)

		if sm_gitpath is not None:
		self.git_dir = _expand_path(sm_gitpath)
		self.git_dir = _expand_path(sm_gitpath, expand_vars)
		self._working_tree_dir = curpath
		break

Expand DownExpand Up		@@ -844,7 +853,7 @@ def blame(self, rev, file, incremental=False, **kwargs):
		return blames

		@classmethod
		def init(cls, path=None, mkdir=True, odbt=DefaultDBType, **kwargs):
		def init(cls, path=None, mkdir=True, odbt=DefaultDBType,expand_vars=True,**kwargs):
		"""Initialize a git repository at the given path if specified

		:param path:
Expand All		@@ -862,12 +871,17 @@ 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 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

		:parm kwargs:
		keyword arguments serving as additional options to the git-init command

		:return: ``git.Repo`` (the newly created repo)"""
		if path:
		path = _expand_path(path)
		path = _expand_path(path, expand_vars)
		if mkdir and path and not osp.exists(path):
		os.makedirs(path, 0o755)

Expand Down