From 011cb0a134396e5f2713897e0c22f5124b156cf4 Mon Sep 17 00:00:00 2001 From: Eliah Kagan Date: Thu, 14 Mar 2024 02:35:34 -0400 Subject: [PATCH] Apply Ruff auto-fixes not included in merge --- git/index/base.py | 4 +--- git/repo/fun.py | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/git/index/base.py b/git/index/base.py index 883d086f5..74ad65394 100644 --- a/git/index/base.py +++ b/git/index/base.py @@ -1467,9 +1467,7 @@ def reset( # does not handle NULL_TREE for `other`. (The suppressed mypy error is about this.) def diff( self, - other: Union[ # type: ignore[override] - Literal[git_diff.DiffConstants.INDEX], "Tree", "Commit", str, None - ] = git_diff.INDEX, + other: Union[Literal[git_diff.DiffConstants.INDEX], "Tree", "Commit", str, None] = git_diff.INDEX, # type: ignore[override] paths: Union[PathLike, List[PathLike], Tuple[PathLike, ...], None] = None, create_patch: bool = False, **kwargs: Any, diff --git a/git/repo/fun.py b/git/repo/fun.py index b65432b09..0ac481206 100644 --- a/git/repo/fun.py +++ b/git/repo/fun.py @@ -138,13 +138,11 @@ def short_to_long(odb: "GitCmdObjectDB", hexsha: str) -> Optional[bytes]: @overload -def name_to_object(repo: "Repo", name: str, return_ref: Literal[False] = ...) -> AnyGitObject: - ... +def name_to_object(repo: "Repo", name: str, return_ref: Literal[False] = ...) -> AnyGitObject: ... @overload -def name_to_object(repo: "Repo", name: str, return_ref: Literal[True]) -> Union[AnyGitObject, SymbolicReference]: - ... +def name_to_object(repo: "Repo", name: str, return_ref: Literal[True]) -> Union[AnyGitObject, SymbolicReference]: ... def name_to_object(repo: "Repo", name: str, return_ref: bool = False) -> Union[AnyGitObject, SymbolicReference]: