Fetch info can now deal much better with non-default ref specs, fixes #24, #25

1 files changed, 48 insertions, 4 deletions

diff --git a/git/test/test_remote.py b/git/test/test_remote.py
index ad1ba616..3e9ba8b8 100644
--- a/git/test/test_remote.py
+++ b/git/test/test_remote.py
@@ -443,11 +443,55 @@ class TestRemote(TestBase):
 		
 	def test_fetch_info(self):
 		# assure we can handle remote-tracking branches
-		fi = FetchInfo._from_line(self.rorepo,  
-							"* [new branch]      master     -> local/master", 
-							"c437ee5deb8d00cf02f03720693e4c802e99f390	not-for-merge	remote-tracking branch '0.3' of git://github.com/gitpython-developers/GitPython")
+		fetch_info_line_fmt = "c437ee5deb8d00cf02f03720693e4c802e99f390	not-for-merge	%s '0.3' of git://github.com/gitpython-developers/GitPython"
+		remote_info_line_fmt = "* [new branch]      nomatter     -> %s"
+		fi = FetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "local/master", 
+							fetch_info_line_fmt % 'remote-tracking branch')
 		assert fi.ref.is_valid()
 		assert fi.ref.commit
 		
+		# handles non-default refspecs: One can specify a different path in refs/remotes
+		# or a special path just in refs/something for instance
 		
-	
+		fi = FetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "subdir/tagname", 
+							fetch_info_line_fmt % 'tag')
+		
+		assert isinstance(fi.ref, TagReference)
+		assert fi.ref.path.startswith('refs/tags')
+		
+		# it could be in a remote direcftory though
+		fi = FetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "remotename/tags/tagname", 
+							fetch_info_line_fmt % 'tag')
+		
+		assert isinstance(fi.ref, TagReference)
+		assert fi.ref.path.startswith('refs/remotes/')
+		
+		# it can also be anywhere !
+		tag_path = "refs/something/remotename/tags/tagname"
+		fi = FetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % tag_path, 
+							fetch_info_line_fmt % 'tag')
+		
+		assert isinstance(fi.ref, TagReference)
+		assert fi.ref.path == tag_path
+		
+		# branches default to refs/remotes
+		fi = FetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "remotename/branch", 
+							fetch_info_line_fmt % 'branch')
+		
+		assert isinstance(fi.ref, RemoteReference)
+		assert fi.ref.remote_name == 'remotename'
+		
+		# but you can force it anywhere, in which case we only have a references
+		fi = FetchInfo._from_line(self.rorepo,
+							remote_info_line_fmt % "refs/something/branch", 
+							fetch_info_line_fmt % 'branch')
+		
+		assert type(fi.ref) is Reference
+		assert fi.ref.path == "refs/something/branch"
+		
+