Commit706d3a2

committed

Minor fix to make read_gitfile work .

1 parent22c4671 commit706d3a2Copy full SHA for 706d3a2

File tree

+19

-14

lines changed

+19

-14

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@`
`35`	`35`	`rev_parse,`
`36`	`36`	`is_git_dir,`
`37`	`37`	`find_git_dir,`
`38`		`-touch`
`39`		`-read_gitfile,`
	`38`	`+read_gitfile,`
	`39`	`+touch,`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`importos`
`@@ -117,7 +117,7 @@ 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)`
	`120`	`+gitpath=read_gitfile(curpath)`
`121`	`121`	`ifgitpath:`
`122`	`122`	`self.git_dir=gitpath`
`123`	`123`	`self._working_tree_dir=curpath`

Lines changed: 16 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,8 @@`
`13`	`13`	`)`
`14`	`14`	`fromstringimportdigits`
`15`	`15`
`16`		`-__all__= ('rev_parse','is_git_dir','touch')`
	`16`	`+__all__= ('rev_parse','is_git_dir','touch','read_gitfile','find_git_dir','name_to_object',`
	`17`	`+'short_to_long','deref_tag','to_commit')`
`17`	`18`
`18`	`19`
`19`	`20`	`deftouch(filename):`
`@@ -46,16 +47,20 @@ def find_git_dir(d):`
`46`	`47`	`returnNone`
`47`	`48`
`48`	`49`	`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`
	`50`	`+""" This is taken from the git setup.c:read_gitfile function.`
	`51`	`+ :return gitdir path or None if gitfile is invalid."""`
	`52`	`+iffisNone:`
	`53`	`+returnNone`
	`54`	`+try:`
	`55`	`+line=open(f,'r').readline().rstrip()`
	`56`	`+except (OSError,IOError):`
	`57`	`+# File might not exist or is unreadable - ignore`
	`58`	`+returnNone`
	`59`	`+# end handle file access`
	`60`	`+ifline[0:8]!='gitdir: ':`
	`61`	`+returnNone`
	`62`	`+path=os.path.realpath(line[8:])`
	`63`	`+returnpathifis_git_dir(path)elseNone`
`59`	`64`
`60`	`65`	`defshort_to_long(odb,hexsha):`
`61`	`66`	`""":return: long hexadecimal sha1 from the given less-than-40 byte hexsha`

Comments

(0)