Commit96c7ac2

committed

Fixed incorrect handling of rev_parse if it was fed with branches that looked like hexshas. Thanks to Ning (frostyplanet) who pointed this issue out

1 parent5eb7fd3 commit96c7ac2Copy full SHA for 96c7ac2

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,11 @@ def name_to_object(repo, name, return_ref=False):`
`59`	`59`	`else:`
`60`	`60`	`hexsha=name`
`61`	`61`	`# END handle short shas`
`62`		`-else:`
	`62`	`+#END find sha if it matches`
	`63`	`+`
	`64`	`+# if we couldn't find an object for what seemed to be a short hexsha`
	`65`	`+# try to find it as reference anyway, it could be named 'aaa' for instance`
	`66`	`+ifhexshaisNone:`
`63`	`67`	`forbasein ('%s','refs/%s','refs/tags/%s','refs/heads/%s','refs/remotes/%s','refs/remotes/%s/HEAD'):`
`64`	`68`	`try:`
`65`	`69`	`hexsha=SymbolicReference.dereference_recursive(repo,base%name)`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,12 @@ def _assert_rev_parse(self, name):`
`464`	`464`
`465`	`465`	`returnorig_obj`
`466`	`466`
	`467`	`+@with_rw_repo('HEAD',bare=False)`
	`468`	`+deftest_rw_rev_parse(self,rwrepo):`
	`469`	`+# verify it does not confuse branches with hexsha ids`
	`470`	`+ahead=rwrepo.create_head('aaaaaaaa')`
	`471`	`+assert(rwrepo.rev_parse(str(ahead))==ahead.commit)`
	`472`	`+`
`467`	`473`	`deftest_rev_parse(self):`
`468`	`474`	`rev_parse=self.rorepo.rev_parse`
`469`	`475`
`@@ -573,7 +579,6 @@ def test_rev_parse(self):`
`573`	`579`	`# currently, nothing more is supported`
`574`	`580`	`self.failUnlessRaises(NotImplementedError,rev_parse,"@{1 week ago}")`
`575`	`581`
`576`		`-`
`577`	`582`	`deftest_repo_odbtype(self):`
`578`	`583`	`target_type=GitDB`
`579`	`584`	`ifsys.version_info[1]<5:`

Comments

(0)