Jul 20, 2019 · Dec 24, 2018 · Dec 24, 2018 · Feb 2, 2019 · Dec 31, 2018 · Jan 6, 2019
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
                    entry = index.entries[index.entry_key(p, 0)]
                    sm = Submodule(repo, entry.binsha, entry.mode, entry.path)
                except KeyError:
                    raise InvalidGitRepositoryError(
                        "Gitmodule path %r did not exist in revision of parent commit %s" % (p, parent_commit))
                    # The submodule doesn't exist, probably it wasn't
                    # removed from the .gitmodules file.
                    continue
                # END handle keyerror
            # END handle critical error

diff --git a/git/test/test_submodule.py b/git/test/test_submodule.py
 # This module is part of GitPython and is released under
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 import os
 import shutil
 import sys
 from unittest import skipIf

        with sm.config_writer() as writer:
            writer.set_value('path', fp)    # change path to something with prefix AFTER url change

        # update fails as list_items in such a situations cannot work, as it cannot
        # find the entry at the changed path
        self.failUnlessRaises(InvalidGitRepositoryError, rm.update, recursive=False)
        # update doesn't fail, because list_items ignores the wrong path in such situations.
        rm.update(recursive=False)

        # move it properly - doesn't work as it its path currently points to an indexentry
        # which doesn't exist ( move it to some path, it doesn't matter here )
                                  url=empty_repo_dir, no_checkout=checkout_mode and True or False)
        # end for each checkout mode

    @with_rw_directory
    def test_list_only_valid_submodules(self, rwdir):
        repo_path = osp.join(rwdir, 'parent')
        repo = git.Repo.init(repo_path)
        repo.git.submodule('add', self._small_repo_url(), 'module')
        repo.index.commit("add submodule")

        assert len(repo.submodules) == 1

        # Delete the directory from submodule
        submodule_path = osp.join(repo_path, 'module')
        shutil.rmtree(submodule_path)
        repo.git.add([submodule_path])
        repo.index.commit("remove submodule")

        repo = git.Repo(repo_path)
        assert len(repo.submodules) == 0

    @skipIf(HIDE_WINDOWS_KNOWN_ERRORS,
            """FIXME on cygwin: File "C:\\projects\\gitpython\\git\\cmd.py", line 671, in execute
                raise GitCommandError(command, status, stderr_value, stdout_value)
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1184,8 +1184,9 @@ def iter_items(cls, repo, parent_commit='HEAD'):
		entry = index.entries[index.entry_key(p, 0)]
		sm = Submodule(repo, entry.binsha, entry.mode, entry.path)
		except KeyError:
		raise InvalidGitRepositoryError(
Copy link Member ByronDec 31, 2018 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Is there a way for this Exception to stay, just as there is a test that expects this behaviour (see the test-failure on travis). Copy link ContributorAuthor stsewdJan 6, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. If we do that, we wouldn't be able to keep listing the submodules here. Copy link Member ByronJan 12, 2019 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. @stsewd I think all that's left before the merge is to fix the now failing test. It could be changed to now expect to no failure and to see a listing of the existing submodules - if you think there is not too much overlap with the test you added. stsewd reacted with thumbs up emoji
		"Gitmodule path %r did not exist in revision of parent commit %s" % (p, parent_commit))
		# The submodule doesn't exist, probably it wasn't
		# removed from the .gitmodules file.
		continue
		# END handle keyerror
		# END handle critical error

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,6 +2,7 @@
		# This module is part of GitPython and is released under
		# the BSD License: http://www.opensource.org/licenses/bsd-license.php
		import os
		import shutil
		import sys
		from unittest import skipIf

Expand DownExpand Up		@@ -479,9 +480,8 @@ def test_root_module(self, rwrepo):
		with sm.config_writer() as writer:
		writer.set_value('path', fp) # change path to something with prefix AFTER url change

		# update fails as list_items in such a situations cannot work, as it cannot
		# find the entry at the changed path
		self.failUnlessRaises(InvalidGitRepositoryError, rm.update, recursive=False)
		# update doesn't fail, because list_items ignores the wrong path in such situations.
		rm.update(recursive=False)

		# move it properly - doesn't work as it its path currently points to an indexentry
		# which doesn't exist ( move it to some path, it doesn't matter here )
Expand DownExpand Up		@@ -660,6 +660,24 @@ def test_add_empty_repo(self, rwdir):
		url=empty_repo_dir, no_checkout=checkout_mode and True or False)
		# end for each checkout mode

		@with_rw_directory
		def test_list_only_valid_submodules(self, rwdir):
Byron marked this conversation as resolved. Show resolvedHide resolved
		repo_path = osp.join(rwdir, 'parent')
		repo = git.Repo.init(repo_path)
		repo.git.submodule('add', self._small_repo_url(), 'module')
		repo.index.commit("add submodule")

		assert len(repo.submodules) == 1

		# Delete the directory from submodule
		submodule_path = osp.join(repo_path, 'module')
		shutil.rmtree(submodule_path)
		repo.git.add([submodule_path])
		repo.index.commit("remove submodule")

		repo = git.Repo(repo_path)
		assert len(repo.submodules) == 0

		@skipIf(HIDE_WINDOWS_KNOWN_ERRORS,
		"""FIXME on cygwin: File "C:\\projects\\gitpython\\git\\cmd.py", line 671, in execute
		raise GitCommandError(command, status, stderr_value, stdout_value)
Expand Down