diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| m--------- | git/ext/gitdb | 0 | ||||
| -rw-r--r-- | git/test/lib/helper.py | 2 | ||||
| -rw-r--r-- | git/test/test_submodule.py | 7 |
4 files changed, 6 insertions, 5 deletions
diff --git a/.gitmodules b/.gitmodules index 2fb04c9a..271899fc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "gitdb"] path = git/ext/gitdb - url = git://gitorious.org/git-python/gitdb.git + url = git://github.com/Byron/gitdb.git diff --git a/git/ext/gitdb b/git/ext/gitdb -Subproject 1bc281d31b8d31fd4dcbcd9b441b5c7b2c1b0bb +Subproject 9f977b8baaf9cbe9b38f3bdf4887cef5370b222 diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py index 4e7b5cf6..76aaaa38 100644 --- a/git/test/lib/helper.py +++ b/git/test/lib/helper.py @@ -12,7 +12,7 @@ import tempfile import shutil import cStringIO -GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(__file__))) +GIT_REPO = os.path.dirname(os.path.dirname(os.path.dirname(os.path.dirname(__file__)))) __all__ = ( 'fixture_path', 'fixture', 'absolute_project_path', 'StringProcessAdapter', diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py index b8a25e02..3a0c5208 100644 --- a/git/test/test_submodule.py +++ b/git/test/test_submodule.py @@ -20,7 +20,7 @@ prog = TestRootProgress() class TestSubmodule(TestBase): - k_subm_current = "83a9e4a0dad595188ff3fb35bc3dfc4d931eff6d" + k_subm_current = "cb68eef0865df6aedbc11cd81888625a70da6777" k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3" k_no_subm_tag = "0.1.6" @@ -40,7 +40,7 @@ class TestSubmodule(TestBase): # at a different time, there is None assert len(Submodule.list_items(rwrepo, self.k_no_subm_tag)) == 0 - assert sm.path == 'ext/gitdb' + assert sm.path == 'git/ext/gitdb' assert sm.path != sm.name # in our case, we have ids there, which don't equal the path assert sm.url == 'git://gitorious.org/git-python/gitdb.git' assert sm.branch_path == 'refs/heads/master' # the default ... @@ -184,7 +184,7 @@ class TestSubmodule(TestBase): sm.update(recursive=True, dry_run=True, progress=prog) assert not csm.module_exists() - # update recuesively again + # update recursively again sm.update(recursive=True) assert csm.module_exists() @@ -237,6 +237,7 @@ class TestSubmodule(TestBase): # deletion will fail # NOTE: As we did a few updates in the meanwhile, the indices were reset # Hence we create some changes + csm.set_parent_commit(csm.repo.head.commit) sm.config_writer().set_value("somekey", "somevalue") csm.config_writer().set_value("okey", "ovalue") self.failUnlessRaises(InvalidGitRepositoryError, sm.remove) |