Commit978eb5b

committed

Merge pull request#410 from ppietrasa/master

fix(index): avoid recursing endlessly in add()

2 parents9debf6b +6f67136 commit978eb5bCopy full SHA for 978eb5b

File tree

+22

-3

lines changed

+22

-3

lines changed

Lines changed: 11 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -380,9 +380,17 @@ def raise_exc(e):`
`380`	`380`
`381`	`381`	`# resolve globs if possible`
`382`	`382`	`if'?'inpathor'*'inpathor'['inpath:`
`383`		`-forfinself._iter_expand_paths(glob.glob(abs_path)):`
`384`		`-yieldf.replace(rs,'')`
`385`		`-continue`
	`383`	`+resolved_paths=glob.glob(abs_path)`
	`384`	`+# not abs_path in resolved_paths:`
	`385`	`+# a glob() resolving to the same path we are feeding it with`
	`386`	`+# is a glob() that failed to resolve. If we continued calling`
	`387`	`+# ourselves we'd endlessly recurse. If the condition below`
	`388`	`+# evaluates to true then we are likely dealing with a file`
	`389`	`+# whose name contains wildcard characters.`
	`390`	`+ifabs_pathnotinresolved_paths:`
	`391`	`+forfinself._iter_expand_paths(glob.glob(abs_path)):`
	`392`	`+yieldf.replace(rs,'')`
	`393`	`+continue`
`386`	`394`	`# END glob handling`
`387`	`395`	`try:`
`388`	`396`	`forroot,dirs,filesinos.walk(abs_path,onerror=raise_exc):`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -796,3 +796,14 @@ def test_add_utf8P_path(self, rw_dir):`
`796`	`796`	`r=Repo.init(rw_dir)`
`797`	`797`	`r.index.add([fp])`
`798`	`798`	`r.index.commit('Added orig and prestable')`
	`799`	`+`
	`800`	`+@with_rw_directory`
	`801`	`+deftest_add_a_file_with_wildcard_chars(self,rw_dir):`
	`802`	`+# see issue #407`
	`803`	`+fp=os.path.join(rw_dir,'[.exe')`
	`804`	`+withopen(fp,"wb")asf:`
	`805`	`+f.write(b'something')`
	`806`	`+`
	`807`	`+r=Repo.init(rw_dir)`
	`808`	`+r.index.add([fp])`
	`809`	`+r.index.commit('Added [.exe')`

Comments

(0)