summaryrefslogtreecommitdiff
path: root/test/git/test_submodule.py
diff options
context:
space:
mode:
authorSebastian Thiel <byronimo@gmail.com>2010-11-17 22:38:10 +0100
committerSebastian Thiel <byronimo@gmail.com>2010-11-17 22:38:10 +0100
commit1687283c13caf7ff8d1959591541dff6a171ca1e (patch)
tree393362379df7c27f1f905c94148789063b2fdd5a /test/git/test_submodule.py
parent7cc4d748a132377ffe63534e9777d7541a3253c5 (diff)
downloadgitpython-1687283c13caf7ff8d1959591541dff6a171ca1e.tar.gz
RootModule.update: initial implementation of update method, which should be able to handle submodule removals, additions, path changes and branch changes. All this still needs to be tested though
Diffstat (limited to 'test/git/test_submodule.py')
-rw-r--r--test/git/test_submodule.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/git/test_submodule.py b/test/git/test_submodule.py
index 212b1e1d..8430f4bc 100644
--- a/test/git/test_submodule.py
+++ b/test/git/test_submodule.py
@@ -202,7 +202,7 @@ class TestSubmodule(TestBase):
sm.module().index.reset(working_tree=True)
# this would work
- sm.remove(dry_run=True)
+ assert sm.remove(dry_run=True) is sm
assert sm.module_exists()
sm.remove(force=True, dry_run=True)
assert sm.module_exists()
@@ -213,7 +213,7 @@ class TestSubmodule(TestBase):
self.failUnlessRaises(InvalidGitRepositoryError, sm.remove)
# forcibly delete the child repository
- csm.remove(force=True)
+ assert csm.remove(force=True) is csm
assert not csm.exists()
assert not csm.module_exists()
assert len(sm.children()) == 0
@@ -263,8 +263,8 @@ class TestSubmodule(TestBase):
# needs update as the head changed, it thinks its in the history
# of the repo otherwise
- nsm._parent_commit = rwrepo.head.commit
- osm._parent_commit = rwrepo.head.commit
+ nsm.set_parent_commit(rwrepo.head.commit)
+ osm.set_parent_commit(rwrepo.head.commit)
# MOVE MODULE
#############