Commit997ea34

committed

cygwin,#533: FIX submodules detection (~10TCs fixed)

+ Decygpath sm's `.git` file contents.- Cygwin TCs failing: - PY2: err: 2, fail: 2 - PY3: err: 2, fail: 2

1 parent4486bcb commit997ea34Copy full SHA for 997ea34

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ def __init__(self, path=None, odbt=DefaultDBType, search_parent_directories=Fals`
`109`	`109`	`:raise InvalidGitRepositoryError:`
`110`	`110`	`:raise NoSuchPathError:`
`111`	`111`	`:return: git.Repo """`
`112`		`-ifpathandGit.is_cygwin():`
	`112`	`+ifGit.is_cygwin():`
`113`	`113`	`path=decygpath(path)`
`114`	`114`
`115`	`115`	`epath=_expand_path(pathoros.getcwd())`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,14 @@`
`6`	`6`	`fromgit.excimportWorkTreeRepositoryUnsupported`
`7`	`7`	`fromgit.objectsimportObject`
`8`	`8`	`fromgit.refsimportSymbolicReference`
`9`		`-fromgit.utilimporthex_to_bin,bin_to_hex`
	`9`	`+fromgit.utilimporthex_to_bin,bin_to_hex,decygpath`
`10`	`10`	`fromgitdb.excimport (`
`11`	`11`	`BadObject,`
`12`	`12`	`BadName,`
`13`	`13`	`)`
`14`	`14`
`15`	`15`	`importos.pathasosp`
	`16`	`+fromgit.cmdimportGit`
`16`	`17`
`17`	`18`
`18`	`19`	`__all__= ('rev_parse','is_git_dir','touch','find_git_dir','name_to_object','short_to_long','deref_tag',`
`@@ -59,6 +60,9 @@ def find_git_dir(d):`
`59`	`60`	`else:`
`60`	`61`	`ifcontent.startswith('gitdir: '):`
`61`	`62`	`path=content[8:]`
	`63`	`+ifGit.is_cygwin():`
	`64`	+## Cygwin creates submodules prefixed with `/cygdrive/...` suffixes.
	`65`	`+path=decygpath(path)`
`62`	`66`	`ifnotosp.isabs(path):`
`63`	`67`	`path=osp.join(osp.dirname(d),path)`
`64`	`68`	`returnfind_git_dir(path)`

Comments

(0)