Commitec0b85e

committed

Fixes creating a Repo for a submodule

Fixes#155.

1 parente6a2942 commitec0b85eCopy full SHA for ec0b85e

File tree

+17

-3

lines changed

+17

-3

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@`
`32`	`32`	`from fun import (`
`33`	`33`	`rev_parse,`
`34`	`34`	`is_git_dir,`
	`35`	`+ find_git_dir,`
`35`	`36`	`touch`
`36`	`37`	`)`
`37`	`38`
`@@ -108,8 +109,8 @@ def __init__(self, path=None, odbt = DefaultDBType):`
`108`	`109`	`self.git_dir = curpath`
`109`	`110`	`self._working_tree_dir = os.path.dirname(curpath)`
`110`	`111`	`break`
`111`		`- gitpath = join(curpath, '.git')`
`112`		`- ifis_git_dir(gitpath):`
	`112`	`+ gitpath =find_git_dir(join(curpath, '.git'))`
	`113`	`+ if gitpath is not None:`
`113`	`114`	`self.git_dir = gitpath`
`114`	`115`	`self._working_tree_dir = curpath`
`115`	`116`	`break`
`@@ -119,7 +120,7 @@ def __init__(self, path=None, odbt = DefaultDBType):`
`119`	`120`	`# END while curpath`
`120`	`121`
`121`	`122`	`if self.git_dir is None:`
`122`		`- raise InvalidGitRepositoryError(epath)`
	`123`	`+raise InvalidGitRepositoryError(epath)`
`123`	`124`
`124`	`125`	`self._bare = False`
`125`	`126`	`try:`

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`join,`
`8`	`8`	`isdir,`
`9`	`9`	`isfile,`
	`10`	`+ dirname,`
`10`	`11`	`hex_to_bin,`
`11`	`12`	`bin_to_hex`
`12`	`13`	`)`
`@@ -31,6 +32,18 @@ def is_git_dir(d):`
`31`	`32`	`return False`
`32`	`33`
`33`	`34`
	`35`	`+def find_git_dir(d):`
	`36`	`+ if is_git_dir(d):`
	`37`	`+ return d`
	`38`	`+ elif isfile(d):`
	`39`	`+ with open(d) as fp:`
	`40`	`+ content = fp.read().rstrip()`
	`41`	`+ if content.startswith('gitdir: '):`
	`42`	`+ d = join(dirname(d), content[8:])`
	`43`	`+ return find_git_dir(d)`
	`44`	`+ return None`
	`45`	`+`
	`46`	`+`
`34`	`47`	`def short_to_long(odb, hexsha):`
`35`	`48`	`""":return: long hexadecimal sha1 from the given less-than-40 byte hexsha`
`36`	`49`	`or None if no candidate could be found.`

Comments

(0)