diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/git/test_base.py | 16 | ||||
| -rw-r--r-- | test/testlib/helper.py | 4 |
2 files changed, 18 insertions, 2 deletions
diff --git a/test/git/test_base.py b/test/git/test_base.py index a7ef9374..3472608e 100644 --- a/test/git/test_base.py +++ b/test/git/test_base.py @@ -94,6 +94,22 @@ class TestBase(TestBase): assert prev_object is not cur_object # but are different instances # END for each head + @with_rw_repo('0.1.6') + def test_head_reset(self, rw_repo): + cur_head = rw_repo.head + new_head_commit = cur_head.commit.parents[0] + reset_head = Head.reset(rw_repo, new_head_commit, index=True) # index only + assert reset_head.commit == new_head_commit + + self.failUnlessRaises(ValueError, Head.reset, rw_repo, new_head_commit, index=False, working_tree=True) + new_head_commit = new_head_commit.parents[0] + reset_head = Head.reset(rw_repo, new_head_commit, index=True, working_tree=True) # index + wt + assert reset_head.commit == new_head_commit + + # paths + Head.reset(rw_repo, new_head_commit, paths = "lib") + + def test_get_object_type_by_name(self): for tname in base.Object.TYPES: assert base.Object in get_object_type_by_name(tname).mro() diff --git a/test/testlib/helper.py b/test/testlib/helper.py index eef7876f..ab4b9f4e 100644 --- a/test/testlib/helper.py +++ b/test/testlib/helper.py @@ -100,7 +100,7 @@ def with_rw_repo(working_tree_ref): def repo_creator(self): repo_dir = tempfile.mktemp("non_bare_repo") rw_repo = self.rorepo.clone(repo_dir, shared=True, bare=False, n=True) - rw_repo.git.checkout(working_tree_ref) + rw_repo.git.checkout("-b", "master", working_tree_ref) try: return func(self, rw_repo) finally: @@ -134,7 +134,7 @@ def with_rw_and_rw_remote_repo(working_tree_ref): rw_remote_repo = self.rorepo.clone(remote_repo_dir, shared=True, bare=True) rw_repo = rw_remote_repo.clone(repo_dir, shared=True, bare=False, n=True) # recursive alternates info ? - rw_repo.git.checkout(working_tree_ref) + rw_repo.git.checkout("-b", "master", working_tree_ref) try: return func(self, rw_repo, rw_remote_repo) finally: |