summaryrefslogtreecommitdiff
path: root/git/diff.py
diff options
context:
space:
mode:
authorYobmod <yobmod@gmail.com>2021-07-09 16:27:34 +0100
committerYobmod <yobmod@gmail.com>2021-07-09 16:27:34 +0100
commit797e962fc1811ddc5a5a34308bd243953eb77135 (patch)
tree8c4d3334c4ae2f4a579ed962c0d1e3b0d7e47b0f /git/diff.py
parentb03af0547f5381cf4043a43acf533687d91f0ea1 (diff)
downloadgitpython-797e962fc1811ddc5a5a34308bd243953eb77135.tar.gz
Make IndexFile and Diffable .diff() types agree
Diffstat (limited to 'git/diff.py')
-rw-r--r--git/diff.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/git/diff.py b/git/diff.py
index 1e2ee740..7ca98ec3 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -20,6 +20,7 @@ from git.types import PathLike, TBD, Literal, TypeGuard
if TYPE_CHECKING:
from .objects.tree import Tree
+ from .objects import Commit
from git.repo.base import Repo
from git.objects.base import IndexObject
from subprocess import Popen
@@ -90,7 +91,7 @@ class Diffable(object):
Subclasses can use it to alter the behaviour of the superclass"""
return args
- def diff(self, other: Union[Type['Index'], 'Tree', None, str] = Index,
+ def diff(self, other: Union[Type['Index'], 'Tree', 'Commit', None, str] = Index, # object for git.NULL_TREE
paths: Union[PathLike, List[PathLike], Tuple[PathLike, ...], None] = None,
create_patch: bool = False, **kwargs: Any) -> 'DiffIndex':
"""Creates diffs between two items being trees, trees and index or an