@@ -13,8 +13,6 @@ General
   the std-in command types, as it appears they are not killed when the repo gets 
   deleted. A clear() method could already help to allow long-running programs
   to remove cached commands after an idle time.
-* References should be parsed 'manually' to get around command invocation, but 
-  be sure to be able to read packed refs.
 
 Object
 ------
@@ -83,18 +81,19 @@ Refs
 * For performance reasons it would be good to reimplement git-update-ref to be 
   fully equivalent to what the command does. Currently it does some checking and 
   handles symbolic refs as well as normal refs, updating the reflog if required.
+  Its low-priority though as we don't set references directly that often.
 * I have read that refs can be symbolic refs as well which would imply the need
   to possibly dereference them. This makes sense as they originally where possibly 
   a symbolic link. This would mean References could be derived from SymbolicReference
   officially, but it would still be bad as not all References are symbolic ones.
 * Making the reflog available as command might be useful actually. This way historical 
   references/commits can be returned. Git internally manages this if refs are specified
   with HEAD@{0} for instance
-
+* References should be parsed 'manually' to get around command invocation, but 
+  be sure to be able to read packed refs.
+  
 Remote
 ------
-* iter_items should parse the configuration file manually - currently a command 
-  is issued which is much slower than it has to be ( compared to manual parsing )
 * When parsing fetch-info, the regex will not allow spaces in the target remote ref as 
   I couldn't properly parse the optional space separated note in that case. Probably 
   the regex should be improved to handle this gracefully.
 
@@ -444,10 +444,16 @@ def iter_items(cls, repo):
 		Returns
 			Iterator yielding Remote objects of the given repository
 		"""
-		seen_remotes = set()
-		for name in repo.git.remote().splitlines():
-			yield Remote(repo, name)
-		# END for each ref
+		for section in repo.config_reader("repository").sections():
+			print section
+			if not section.startswith('remote'):
+				continue
+			lbound = section.find('"')
+			rbound = section.rfind('"')
+			if lbound == -1 or rbound == -1:
+				raise ValueError("Remote-Section has invalid format: %r" % section)
+			yield Remote(repo, section[lbound+1:rbound])
+		# END for each configuration section
 
 	@property
 	def refs(self):