summaryrefslogtreecommitdiff
path: root/git/diff.py
diff options
context:
space:
mode:
authorYobmod <yobmod@gmail.com>2021-07-09 22:58:02 +0100
committerYobmod <yobmod@gmail.com>2021-07-09 22:58:02 +0100
commit09053c565915d114384b1c20af8eecfed98c8069 (patch)
tree9ca044829e8d8a17242a14c37a5af0f963c0bb96 /git/diff.py
parent797e962fc1811ddc5a5a34308bd243953eb77135 (diff)
downloadgitpython-09053c565915d114384b1c20af8eecfed98c8069.tar.gz
Improve IndexFile_process_diff_args() to get checks to rerun
Diffstat (limited to 'git/diff.py')
-rw-r--r--git/diff.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/git/diff.py b/git/diff.py
index 7ca98ec3..51dac390 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -82,8 +82,8 @@ class Diffable(object):
class Index(object):
pass
- def _process_diff_args(self, args: List[Union[PathLike, 'Diffable', Type['Diffable.Index']]]
- ) -> List[Union[PathLike, 'Diffable', Type['Diffable.Index']]]:
+ def _process_diff_args(self, args: List[Union[str, 'Diffable', Type['Diffable.Index'], object]]
+ ) -> List[Union[str, 'Diffable', Type['Diffable.Index'], object]]:
"""
:return:
possibly altered version of the given args list.
@@ -91,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', 'Commit', None, str] = Index, # object for git.NULL_TREE
+ def diff(self, other: Union[Type['Index'], 'Tree', 'Commit', None, str, object] = Index,
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
@@ -124,7 +124,7 @@ class Diffable(object):
:note:
On a bare repository, 'other' needs to be provided as Index or as
as Tree/Commit, or a git command error will occur"""
- args: List[Union[PathLike, Diffable, Type['Diffable.Index']]] = []
+ args: List[Union[PathLike, Diffable, Type['Diffable.Index'], object]] = []
args.append("--abbrev=40") # we need full shas
args.append("--full-index") # get full index paths, not only filenames