Commit09c88be

committed

remote: unfix fetch-infos paring of8a2f7dc(pydev fixes)

+ Mark another TC failing when not in master.

1 parentaafde7d commit09c88beCopy full SHA for 09c88be

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -625,8 +625,8 @@ def _get_fetch_info_from_stderr(self, proc, progress):`
`625`	`625`	`forplineinprogress_handler(line):`
`626`	`626`	`# END handle special messages`
`627`	`627`	`forcmdincmds:`
`628`		`-iflen(pline)>1andpline[0]==' 'andpline[1]==cmd:`
`629`		`-fetch_info_lines.append(pline)`
	`628`	`+iflen(line)>1andline[0]==' 'andline[1]==cmd:`
	`629`	`+fetch_info_lines.append(line)`
`630`	`630`	`continue`
`631`	`631`	`# end find command code`
`632`	`632`	`# end for each comand code we know`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -909,6 +909,9 @@ def test_work_tree_unsupported(self, rw_dir):`
`909`	`909`	`rw_master=self.rorepo.clone(join_path_native(rw_dir,'master_repo'))`
`910`	`910`	`rw_master.git.checkout('HEAD~10')`
`911`	`911`	`worktree_path=join_path_native(rw_dir,'worktree_repo')`
`912`		`-rw_master.git.worktree('add',worktree_path,'master')`
	`912`	`+try:`
	`913`	`+rw_master.git.worktree('add',worktree_path,'master')`
	`914`	`+exceptExceptionasex:`
	`915`	+raiseAssertionError(ex,"It's ok if TC not running from `master`.")
`913`	`916`
`914`	`917`	`self.failUnlessRaises(InvalidGitRepositoryError,Repo,worktree_path)`

Comments

(0)