Commitcc92d51

authored

Merge pull request#1545 from Lightborne/fix_ignored

Fix ignored

2 parentsf594266 +df4dabb commitcc92d51Copy full SHA for cc92d51

File tree

+36

-2

lines changed

+36

-2

lines changed

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -873,8 +873,15 @@ def ignored(self, *paths: PathLike) -> List[str]:`
`873`	`873`	`"""`
`874`	`874`	`try:`
`875`	`875`	`proc:str=self.git.check_ignore(*paths)`
`876`		`-exceptGitCommandError:`
`877`		`-return []`
	`876`	`+exceptGitCommandErroraserr:`
	`877`	`+# If return code is 1, this means none of the items in *paths`
	`878`	`+# are ignored by Git, so return an empty list. Raise the`
	`879`	`+# exception on all other return codes.`
	`880`	`+iferr.status==1:`
	`881`	`+return []`
	`882`	`+else:`
	`883`	`+raise`
	`884`	`+`
`878`	`885`	`returnproc.replace("\\\\","\\").replace('"',"").split("\n")`
`879`	`886`
`880`	`887`	`@property`

Lines changed: 27 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1384,3 +1384,30 @@ def test_clone_from_command_injection(self, rw_repo):`
`1384`	`1384`	`rw_repo.clone_from(payload,temp_repo.common_dir)`
`1385`	`1385`
`1386`	`1386`	`assertnotunexpected_file.exists()`
	`1387`	`+`
	`1388`	`+deftest_ignored_items_reported(self):`
	`1389`	`+withtempfile.TemporaryDirectory()astdir:`
	`1390`	`+tmp_dir=pathlib.Path(tdir)`
	`1391`	`+temp_repo=Repo.init(tmp_dir/"repo")`
	`1392`	`+`
	`1393`	`+gi=tmp_dir/"repo"/".gitignore"`
	`1394`	`+`
	`1395`	`+withopen(gi,'w')asfile:`
	`1396`	`+file.write('ignored_file.txt\n')`
	`1397`	`+file.write('ignored_dir/\n')`
	`1398`	`+`
	`1399`	`+asserttemp_repo.ignored(['included_file.txt','included_dir/file.txt'])== []`
	`1400`	`+asserttemp_repo.ignored(['ignored_file.txt'])== ['ignored_file.txt']`
	`1401`	`+asserttemp_repo.ignored(['included_file.txt','ignored_file.txt'])== ['ignored_file.txt']`
	`1402`	`+asserttemp_repo.ignored(['included_file.txt','ignored_file.txt','included_dir/file.txt','ignored_dir/file.txt'])== ['ignored_file.txt','ignored_dir/file.txt']`
	`1403`	`+`
	`1404`	`+deftest_ignored_raises_error_w_symlink(self):`
	`1405`	`+withtempfile.TemporaryDirectory()astdir:`
	`1406`	`+tmp_dir=pathlib.Path(tdir)`
	`1407`	`+temp_repo=Repo.init(tmp_dir/"repo")`
	`1408`	`+`
	`1409`	`+os.mkdir(tmp_dir/"target")`
	`1410`	`+os.symlink(tmp_dir/"target",tmp_dir/"symlink")`
	`1411`	`+`
	`1412`	`+withpytest.raises(GitCommandError):`
	`1413`	`+temp_repo.ignored(tmp_dir/"symlink/file.txt")`

Comments

(0)