manual fixing

Author: Borda

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/crate-ci/typos
-  rev: v1.16.26
+  rev: v1.19.0
   hooks:
     - id: typos
       args: []  # empty to do not write fixes

git/index/base.py

@@ -194,7 +194,7 @@ def _delete_entries_cache(self) -> None:
 
     def _deserialize(self, stream: IO) -> "IndexFile":
         """Initialize this instance with index values read from the given stream."""
-        self.version, self.entries, self._extension_data, _contain_sha = read_cache(stream)
+        self.version, self.entries, self._extension_data, _content_sha = read_cache(stream)
         return self
 
     def _entries_sorted(self) -> List[IndexEntry]:
@@ -439,9 +439,9 @@ def raise_exc(e: Exception) -> NoReturn:
             # END glob handling
             try:
                 for root, _dirs, files in os.walk(abs_path, onerror=raise_exc):
-                    for real_file in files:
+                    for relative_fpath in files:
                         # Add relative paths only.
-                        yield osp.join(root.replace(rs, ""), real_file)
+                        yield osp.join(root.replace(rs, ""), relative_fpath)
                     # END for each file in subdir
                 # END for each subdirectory
             except OSError:
@@ -951,7 +951,7 @@ def handle_null_entries(self: "IndexFile") -> None:
 
         return entries_added
 
-    def _items_to_real_paths(
+    def _items_to_relative_paths(
         self,
         items: Union[PathLike, Sequence[Union[PathLike, BaseIndexEntry, Blob, Submodule]]],
     ) -> List[PathLike]:
@@ -1025,7 +1025,7 @@ def remove(
         args.append("--")
 
         # Preprocess paths.
-        paths = self._items_to_real_paths(items)
+        paths = self._items_to_relative_paths(items)
         removed_paths = self.repo.git.rm(args, paths, **kwargs).splitlines()
 
         # Process output to gain proper paths.
@@ -1078,7 +1078,7 @@ def move(
         if skip_errors:
             args.append("-k")
 
-        paths = self._items_to_real_paths(items)
+        paths = self._items_to_relative_paths(items)
         if len(paths) < 2:
             raise ValueError("Please provide at least one source and one destination of the move operation")
 

git/objects/submodule/base.py

@@ -416,11 +416,11 @@ def _write_git_file_and_module_config(cls, working_tree_dir: PathLike, module_ab
             Absolute path to the bare repository.
         """
         git_file = osp.join(working_tree_dir, ".git")
-        real_path = osp.relpath(module_abspath, start=working_tree_dir)
+        relative_fpath = osp.relpath(module_abspath, start=working_tree_dir)
         if sys.platform == "win32" and osp.isfile(git_file):
             os.remove(git_file)
         with open(git_file, "wb") as fp:
-            fp.write(("gitdir: %s" % real_path).encode(defenc))
+            fp.write(("gitdir: %s" % relative_fpath).encode(defenc))
 
         with GitConfigParser(osp.join(module_abspath, "config"), read_only=False, merge_includes=False) as writer:
             writer.set_value(

git/refs/symbolic.py

@@ -134,7 +134,7 @@ def _iter_packed_refs(cls, repo: "Repo") -> Iterator[Tuple[str, str]]:
                         # that can go on this line, as per comments in git file
                         # refs/packed-backend.c
                         # I looked at master on 2017-10-11,
-                        # commit 111ef79safe, after tag v2.15.0-rc1
+                        # commit 111ef79afe, after tag v2.15.0-rc1
                         # from repo https://github.com/git/git.git
                         if line.startswith("# pack-refs with:") and "peeled" not in line:
                             raise TypeError("PackingType of packed-Refs not understood: %r" % line)
@@ -226,7 +226,7 @@ def _get_ref_info_helper(
         :return:
             *(str(sha), str(target_ref_path))*, where:
 
-            * *sha* is of the file at real_path points to if available, or ``None``.
+            * *sha* is of the file at relative_fpath points to if available, or ``None``.
             * *target_ref_path* is the reference we point to, or ``None``.
         """
         if ref_path:
@@ -272,7 +272,7 @@ def _get_ref_info(cls, repo: "Repo", ref_path: Union[PathLike, None]) -> Union[T
         :return:
             *(str(sha), str(target_ref_path))*, where:
 
-            * *sha* is of the file at real_path points to if available, or ``None``.
+            * *sha* is of the file at relative_fpath points to if available, or ``None``.
             * *target_ref_path* is the reference we point to, or ``None``.
         """
         return cls._get_ref_info_helper(repo, ref_path)
@@ -813,7 +813,7 @@ def _iter_items(
     ) -> Iterator[T_References]:
         if common_path is None:
             common_path = cls._common_path_default
-        real_paths = set()
+        relative_fpaths = set()
 
         # Walk loose refs.
         # Currently we do not follow links.
@@ -828,19 +828,19 @@ def _iter_items(
                 if f == "packed-refs":
                     continue
                 abs_path = to_native_path_linux(join_path(root, f))
-                real_paths.add(abs_path.replace(to_native_path_linux(repo.common_dir) + "/", ""))
+                relative_fpaths.add(abs_path.replace(to_native_path_linux(repo.common_dir) + "/", ""))
             # END for each file in root directory
         # END for each directory to walk
 
         # Read packed refs.
-        for _sha, real_path in cls._iter_packed_refs(repo):
-            if real_path.startswith(str(common_path)):
-                real_paths.add(real_path)
+        for _sha, relative_fpath in cls._iter_packed_refs(repo):
+            if relative_fpath.startswith(str(common_path)):
+                relative_fpaths.add(relative_fpath)
             # END relative path matches common path
         # END packed refs reading
 
         # Yield paths in sorted order.
-        for path in sorted(real_paths):
+        for path in sorted(relative_fpaths):
             try:
                 yield cls.from_path(repo, path)
             except ValueError:

test/fixtures/commit_with_gpgsig

@@ -13,7 +13,7 @@ gpgsig -----BEGIN PGP SIGNATURE-----
  Tack6sxIdK7NXJhV5gAeAOMJBGhO0fHl8UUr96vGEKwtxyZhWf8cuIPOWLk06jA0
  g9DpLqmy/pvyRfiPci+24YdYRBua/vta+yo/Lp85N7Hu/cpIh+q5WSLvUlv09Dmo
  TTTG8Hf6s3lEej7W8z2xcNZoB6GwXd8buSDU8cu0I6mEO9sNtAuUOHp2dBvTA6cX
- PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaAnd
+ PuQW8jg3zofnx7CyNcd3KF3nh2z8mBcDLgh0Q84srZJCPRuxRcp9ylggvAG7iaNd
  XMNvSK8IZtWLkx7k3A3QYt1cN4y1zdSHLR2S+BVCEJea1mvUE+jK5wiB9S4XNtKm
  BX/otlTa8pNE3fWYBxURvfHnMY4i3HQT7Bc1QjImAhMnyo2vJk4ORBJIZ1FTNIhJ
  JzJMZDRLQLFvnzqZuCjE