diff options
| author | Yobmod <yobmod@gmail.com> | 2021-07-08 23:55:09 +0100 |
|---|---|---|
| committer | Yobmod <yobmod@gmail.com> | 2021-07-08 23:55:09 +0100 |
| commit | 627defff96470464884ca81899fd0271e614b3e8 (patch) | |
| tree | d5d755e6d8f751605ec3b8258c697a392b5b2b74 /git/index/fun.py | |
| parent | 4f13b4e23526616f307370dc9a869b067e90b276 (diff) | |
| download | gitpython-627defff96470464884ca81899fd0271e614b3e8.tar.gz | |
Change List to MutableSequence in fun.py _find_by_name()
Diffstat (limited to 'git/index/fun.py')
| -rw-r--r-- | git/index/fun.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/git/index/fun.py b/git/index/fun.py index 774738db..5c09f2b9 100644 --- a/git/index/fun.py +++ b/git/index/fun.py @@ -388,8 +388,9 @@ def aggressive_tree_merge(odb, tree_shas: Sequence[bytes]) -> List[BaseIndexEntr # all three can't be None if ours is None: # added in their branch - out.append(_tree_entry_to_baseindexentry(theirs, 0)) # type: ignore - elif theirs is None: # ours is not None, theirs is None + assert theirs is not None + out.append(_tree_entry_to_baseindexentry(theirs, 0)) + elif theirs is None: # added in our branch out.append(_tree_entry_to_baseindexentry(ours, 0)) else: |