Removed plenty of code which went into git-python. This is just for completeness, gitdb doesn't need to be worked on anymoregitdbmerger

1 files changed, 19 insertions, 20 deletions

diff --git a/gitdb/test/test_refs.py b/gitdb/test/test_refs.py
index 2c571b7..649542f 100644
--- a/gitdb/test/test_refs.py
+++ b/gitdb/test/test_refs.py
@@ -158,26 +158,25 @@ class TestRefs(TestBase):
 		cur_head = HEAD(rw_repo)
 		old_head_commit = cur_head.commit
 		new_head_commit = cur_head.ref.commit.parents[0]
-		if False: #TODO get reset checking back into the game
-			cur_head.reset(new_head_commit, index=True) # index only
-			assert cur_head.reference.commit == new_head_commit
-			
-			self.failUnlessRaises(ValueError, cur_head.reset, new_head_commit, index=False, working_tree=True)
-			new_head_commit = new_head_commit.parents[0]
-			cur_head.reset(new_head_commit, index=True, working_tree=True)	# index + wt
-			assert cur_head.reference.commit == new_head_commit
-			
-			# paths - make sure we have something to do
-			rw_repo.index.reset(old_head_commit.parents[0])
-			cur_head.reset(cur_head, paths = "test")
-			cur_head.reset(new_head_commit, paths = "lib")
-			# hard resets with paths don't work, its all or nothing
-			self.failUnlessRaises(GitCommandError, cur_head.reset, new_head_commit, working_tree=True, paths = "lib")
-			
-			# we can do a mixed reset, and then checkout from the index though
-			cur_head.reset(new_head_commit)
-			rw_repo.index.checkout(["lib"], force=True)#
-		#END ignore block
+		
+		cur_head.reset(new_head_commit, index=True) # index only
+		assert cur_head.reference.commit == new_head_commit
+		
+		self.failUnlessRaises(ValueError, cur_head.reset, new_head_commit, index=False, working_tree=True)
+		new_head_commit = new_head_commit.parents[0]
+		cur_head.reset(new_head_commit, index=True, working_tree=True)	# index + wt
+		assert cur_head.reference.commit == new_head_commit
+		
+		# paths - make sure we have something to do
+		rw_repo.index.reset(old_head_commit.parents[0])
+		cur_head.reset(cur_head, paths = "test")
+		cur_head.reset(new_head_commit, paths = "lib")
+		# hard resets with paths don't work, its all or nothing
+		self.failUnlessRaises(GitCommandError, cur_head.reset, new_head_commit, working_tree=True, paths = "lib")
+		
+		# we can do a mixed reset, and then checkout from the index though
+		cur_head.reset(new_head_commit)
+		rw_repo.index.checkout(["lib"], force=True)#
 		
 		# now that we have a write write repo, change the HEAD reference - its 
 		# like git-reset --soft