@@ -20,7 +20,7 @@ def update(self, op, index, max_count, message=''):
20
20
21
21
class TestSubmodule (TestBase ):
22
22
23
- k_subm_current = "83a9e4a0dad595188ff3fb35bc3dfc4d931eff6d "
23
+ k_subm_current = "cb68eef0865df6aedbc11cd81888625a70da6777 "
24
24
k_subm_changed = "394ed7006ee5dc8bddfd132b64001d5dfc0ffdd3"
25
25
k_no_subm_tag = "0.1.6"
26
26
@@ -40,7 +40,7 @@ def _do_base_tests(self, rwrepo):
40
40
# at a different time, there is None
41
41
assert len (Submodule .list_items (rwrepo , self .k_no_subm_tag )) == 0
42
42
43
- assert sm .path == 'ext/gitdb'
43
+ assert sm .path == 'git/ ext/gitdb'
44
44
assert sm .path != sm .name # in our case, we have ids there, which don't equal the path
45
45
assert sm .url == 'git://gitorious.org/git-python/gitdb.git'
46
46
assert sm .branch_path == 'refs/heads/master' # the default ...
@@ -184,7 +184,7 @@ def _do_base_tests(self, rwrepo):
184
184
sm .update (recursive = True , dry_run = True , progress = prog )
185
185
assert not csm .module_exists ()
186
186
187
- # update recuesively again
187
+ # update recursively again
188
188
sm .update (recursive = True )
189
189
assert csm .module_exists ()
190
190
@@ -237,6 +237,7 @@ def _do_base_tests(self, rwrepo):
237
237
# deletion will fail
238
238
# NOTE: As we did a few updates in the meanwhile, the indices were reset
239
239
# Hence we create some changes
240
+ csm .set_parent_commit (csm .repo .head .commit )
240
241
sm .config_writer ().set_value ("somekey" , "somevalue" )
241
242
csm .config_writer ().set_value ("okey" , "ovalue" )
242
243
self .failUnlessRaises (InvalidGitRepositoryError , sm .remove )
0 commit comments