Fix for mrepo

Yobmod · Yobmod · commit 278a3713a0a5 · 2021-07-06T15:09:36.000+01:00
diff --git a/git/objects/submodule/base.py b/git/objects/submodule/base.py
@@ -418,7 +418,7 @@ def add(cls, repo: 'Repo', name: str, path: PathLike, url: Union[str, None] = No
             # END check url
         # END verify urls match
 
-        # mrepo: Union[Repo, None] = None
+        mrepo: Union[Repo, None] = None
 
         if url is None:
             if not has_module:
@@ -474,7 +474,8 @@ def add(cls, repo: 'Repo', name: str, path: PathLike, url: Union[str, None] = No
                 sm._branch_path = br.path
 
         # we deliberately assume that our head matches our index !
-        sm.binsha = mrepo.head.commit.binsha
+        if mrepo is not None:
+            sm.binsha = mrepo.head.commit.binsha
         index.add([sm], write=True)
 
         return sm
@@ -589,8 +590,8 @@ def update(self, recursive: bool = False, init: bool = True, to_latest_revision:
                 if not dry_run:
                     # see whether we have a valid branch to checkout
                     try:
-                        # assert isinstance(mrepo, Repo)  # cant do this cos of circular import
-                        mrepo = cast('Repo', mrepo)  # Try TypeGuard wirh hasattr?
+                        # assert isinstance(mrepo, Repo)    # cant do this cos of circular import
+                        mrepo = cast('Repo', mrepo)         # Try TypeGuard wirh hasattr, or has_remotes&_head protocol?
                         # find  a remote which has our branch - we try to be flexible
                         remote_branch = find_first_remote_branch(mrepo.remotes, self.branch_name)
                         local_branch = mkhead(mrepo, self.branch_path)
diff --git a/git/types.py b/git/types.py
@@ -57,7 +57,7 @@ class ConfigLevels_NT(NamedTuple):
 
 def assert_never(inp: NoReturn, exc: Union[Exception, None] = None) -> NoReturn:
     if exc is None:
-        assert False, f"An unhandled Literal ({inp}) in an if else chain was found"
+        assert False, f"An unhandled Literal ({inp}) in an if/else chain was found"
     else:
         raise exc
 
