symbolic reference handles different types for comparison more gracefully. Fixed possible issue in test_refs, which occurred in 0.3 previously

Byron · Byron · commit 74b13c58345d · 2011-06-08T11:27:47.000+02:00
diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
@@ -64,7 +64,9 @@ def __repr__(self):
 		return '<git.%s "%s">' % (self.__class__.__name__, self.path)
 		
 	def __eq__(self, other):
-		return self.path == other.path
+		if hasattr(other, 'path'):
+			return self.path == other.path
+		return False
 		
 	def __ne__(self, other):
 		return not ( self == other )
diff --git a/git/test/refs/test_refs.py b/git/test/refs/test_refs.py
@@ -140,7 +140,6 @@ def test_heads(self, rw_repo):
 		assert len(log) == 1
 		assert log[0].oldhexsha == pcommit.NULL_HEX_SHA
 		assert log[0].newhexsha == pcommit.hexsha
-	
 		
 	def test_refs(self):
 		types_found = set()
@@ -285,6 +284,15 @@ def test_head_reset(self, rw_repo):
 		assert remotes
 		for remote in remotes:
 			refs = remote.refs
+			
+			# If a HEAD exists, it must be deleted first. Otherwise it might
+			# end up pointing to an invalid ref it the ref was deleted before.
+			remote_head_name = "HEAD"
+			if remote_head_name in refs:
+				RemoteReference.delete(rw_repo, refs[remote_head_name])
+				del(refs[remote_head_name])
+			#END handle HEAD deletion
+			
 			RemoteReference.delete(rw_repo, *refs)
 			remote_refs_so_far += len(refs)
 			for ref in refs:
