Submodule.move() fixed to deal with 'non-gitfile' clones appropriately.

Byron · Byron · commit a223c7b7730c · 2015-01-19T13:55:38.000+01:00
Improved a test to assure multiple update(init=False|True) calls don't throw. Fixes gitpython-developers#93
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
@@ -636,7 +636,7 @@ def move(self, module_path, configuration=True, module=True):
             os.renames(cur_path, module_checkout_abspath)
             renamed_module = True
 
-            if self._need_gitfile_submodules(self.repo.git):
+            if os.path.isfile(os.path.join(module_checkout_abspath, '.git')):
                 module_abspath = self._module_abspath(self.repo, self.path, self.name)
                 self._write_git_file_and_module_config(module_checkout_abspath, module_abspath)
             # end handle git file rewrite
diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
@@ -377,8 +377,6 @@ def _do_base_tests(self, rwrepo):
             assert nsm.path == pmp
             assert rwrepo.submodules[0].path == pmp
 
-            # TODO lowprio: test remaining exceptions ... for now its okay, the code looks right
-
             # REMOVE 'EM ALL
             ################
             # if a submodule's repo has no remotes, it can't be added without an explicit url
@@ -636,8 +634,20 @@ def test_git_submodules(self, rwdir):
 
         assert sm.exists() and sm.module_exists()
 
-        # test move and rename
-        # TODO
+        clone = git.Repo.clone_from(self._submodule_url(),
+                                    os.path.join(parent.working_tree_dir, 'existing-subrepository'))
+        sm2 = parent.create_submodule('nongit-file-submodule', clone.working_tree_dir)
+        assert len(parent.submodules) == 2
+
+        for _ in range(2):
+            for init in (False, True):
+                sm.update(init=init)
+                sm2.update(init=init)
+            # end for each init state
+        # end for each iteration
+
+        sm.move(sm.path + '_moved')
+        sm2.move(sm2.path + '_moved')
 
     @with_rw_directory
     def test_git_submodule_compatibility(self, rwdir):
