Commit22c4671

committed

Merge branch 'separate-git-dir' ofhttps://github.com/niyaton/GitPython into niyaton-separate-git-dir

Conflicts:git/repo/base.py

2 parents6fc9e61 +53b65e0 commit22c4671Copy full SHA for 22c4671

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@`
`36`	`36`	`is_git_dir,`
`37`	`37`	`find_git_dir,`
`38`	`38`	`touch`
`39`		`- )`
	`39`	`+read_gitfile,`
	`40`	`+)`
`40`	`41`
`41`	`42`	`importos`
`42`	`43`	`importsys`
`@@ -52,7 +53,6 @@`
`52`	`53`
`53`	`54`
`54`	`55`	`classRepo(object):`
`55`		`-`
`56`	`56`	`"""Represents a git repository and allows you to query references,`
`57`	`57`	`gather commit information, generate diffs, create and clone repositories query`
`58`	`58`	`the log.`
`@@ -117,6 +117,11 @@ def __init__(self, path=None, odbt=DefaultDBType):`
`117`	`117`	`self.git_dir=gitpath`
`118`	`118`	`self._working_tree_dir=curpath`
`119`	`119`	`break`
	`120`	`+gitpath=read_gitfile(gitpath)`
	`121`	`+ifgitpath:`
	`122`	`+self.git_dir=gitpath`
	`123`	`+self._working_tree_dir=curpath`
	`124`	`+break`
`120`	`125`	`curpath,dummy=os.path.split(curpath)`
`121`	`126`	`ifnotdummy:`
`122`	`127`	`break`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,17 @@ def find_git_dir(d):`
`45`	`45`	`returnfind_git_dir(d)`
`46`	`46`	`returnNone`
`47`	`47`
	`48`	`+defread_gitfile(f):`
	`49`	`+""" This is taken from the git setup.c:read_gitfile function.`
	`50`	`+:return gitdir path or None if gitfile is invalid."""`
	`51`	`+`
	`52`	`+ifnotisfile(f):`
	`53`	`+returnNone`
	`54`	`+line=open(f,'r').readline().rstrip()`
	`55`	`+ifline[0:8]!='gitdir: ':`
	`56`	`+returnNone`
	`57`	`+path=os.path.realpath(line[8:])`
	`58`	`+returnpathifis_git_dir(path)elseNone`
`48`	`59`
`49`	`60`	`defshort_to_long(odb,hexsha):`
`50`	`61`	`""":return: long hexadecimal sha1 from the given less-than-40 byte hexsha`

Comments

(0)