typos

Author: Borda

.pre-commit-config.yaml

@@ -3,8 +3,7 @@ repos:
   rev: v1.16.26
   hooks:
     - id: typos
-      # empty to do not write fixes
-      # args: []
+      args: []  # empty to do not write fixes
       exclude: pyproject.toml
 
 - repo: https://github.com/astral-sh/ruff-pre-commit

README.md

@@ -101,7 +101,7 @@ In the less common case that you do not want to install test dependencies, `pip
 
 #### With editable *dependencies* (not preferred, and rarely needed)
 
-In rare cases, you may want to work on GitPython and one or both of its [gitdb](https://github.com/gitpython-developers/gitdb) and [smmap](https://github.com/gitpython-developers/smmap) dependencies at the same time, with changes in your local working copy of gitdb or smmap immediatley reflected in the behavior of your local working copy of GitPython. This can be done by making editable installations of those dependencies in the same virtual environment where you install GitPython.
+In rare cases, you may want to work on GitPython and one or both of its [gitdb](https://github.com/gitpython-developers/gitdb) and [smmap](https://github.com/gitpython-developers/smmap) dependencies at the same time, with changes in your local working copy of gitdb or smmap immediately reflected in the behavior of your local working copy of GitPython. This can be done by making editable installations of those dependencies in the same virtual environment where you install GitPython.
 
 If you want to do that *and* you want the versions in GitPython's git submodules to be used, then pass `-e git/ext/gitdb` and/or `-e git/ext/gitdb/gitdb/ext/smmap` to `pip install`. This can be done in any order, and in separate `pip install` commands or the same one, so long as `-e` appears before *each* path. For example, you can install GitPython, gitdb, and smmap editably in the currently active virtual environment this way:
 
@@ -234,7 +234,7 @@ Please have a look at the [contributions file][contributing].
 - [Loki](https://github.com/Neo23x0/Loki)
 - [Omniwallet](https://github.com/OmniLayer/omniwallet)
 - [GitViper](https://github.com/BeayemX/GitViper)
-- [Git Gud](https://github.com/bthayer2365/git-gud)
+- [Git Good](https://github.com/bthayer2365/git-gud)
 
 ### LICENSE
 

doc/source/changes.rst

@@ -20,7 +20,7 @@ https://github.com/gitpython-developers/GitPython/releases/tag/3.1.42
 3.1.41
 ======
 
-This release is relevant for security as it fixes a possible arbitary
+This release is relevant for security as it fixes a possible arbitrary
 code execution on Windows.
 
 See this PR for details: https://github.com/gitpython-developers/GitPython/pull/1792

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, _conten_sha = read_cache(stream)
+        self.version, self.entries, self._extension_data, _contain_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 rela_file in files:
+                    for real_file in files:
                         # Add relative paths only.
-                        yield osp.join(root.replace(rs, ""), rela_file)
+                        yield osp.join(root.replace(rs, ""), real_file)
                     # 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_rela_paths(
+    def _items_to_real_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_rela_paths(items)
+        paths = self._items_to_real_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_rela_paths(items)
+        paths = self._items_to_real_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")
-        rela_path = osp.relpath(module_abspath, start=working_tree_dir)
+        real_path = 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" % rela_path).encode(defenc))
+            fp.write(("gitdir: %s" % real_path).encode(defenc))
 
         with GitConfigParser(osp.join(module_abspath, "config"), read_only=False, merge_includes=False) as writer:
             writer.set_value(

git/objects/util.py

@@ -568,11 +568,11 @@ def addToStack(
                 yield rval
 
             # Only continue to next level if this is appropriate!
-            nd = d + 1
-            if depth > -1 and nd > depth:
+            nb = d + 1
+            if depth > -1 and nb > depth:
                 continue
 
-            addToStack(stack, item, branch_first, nd)
+            addToStack(stack, item, branch_first, nb)
         # END for each item on work stack
 
 

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 111ef79afe, after tag v2.15.0-rc1
+                        # commit 111ef79safe, 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 rela_path points to if available, or ``None``.
+            * *sha* is of the file at real_path 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 rela_path points to if available, or ``None``.
+            * *sha* is of the file at real_path 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
-        rela_paths = set()
+        real_paths = 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))
-                rela_paths.add(abs_path.replace(to_native_path_linux(repo.common_dir) + "/", ""))
+                real_paths.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, rela_path in cls._iter_packed_refs(repo):
-            if rela_path.startswith(str(common_path)):
-                rela_paths.add(rela_path)
+        for _sha, real_path in cls._iter_packed_refs(repo):
+            if real_path.startswith(str(common_path)):
+                real_paths.add(real_path)
             # END relative path matches common path
         # END packed refs reading
 
         # Yield paths in sorted order.
-        for path in sorted(rela_paths):
+        for path in sorted(real_paths):
             try:
                 yield cls.from_path(repo, path)
             except ValueError:

git/util.py

@@ -652,7 +652,7 @@ def _parse_progress_line(self, line: AnyStr) -> None:
             op_code |= self.CHECKING_OUT
         else:
             # Note: On Windows it can happen that partial lines are sent.
-            # Hence we get something like "CompreReceiving objects", which is
+            # Hence we get something like "CompareReceiving objects", which is
             # a blend of "Compressing objects" and "Receiving objects".
             # This can't really be prevented, so we drop the line verbosely
             # to make sure we get informed in case the process spits out new

test/fixtures/commit_with_gpgsig

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

test/fixtures/diff_mode_only

@@ -260,7 +260,7 @@ index d873924860bf4da06ac93db5c6a188f63dd1c3cc..57da75f05e28e8a256922bf345ccd390
 +    # :text:: to_text, text/plain
 +    # :html:: to_html, text/html or application/xhtml+xml or application/html
 +    # :xml:: to_xml, application/xml or text/xml or application/x-xml, adds "Encoding: UTF-8" response header
-+    # :js:: to_json, text/javascript ot application/javascript or application/x-javascript
++    # :js:: to_json, text/javascript to application/javascript or application/x-javascript
 +    # :json:: to_json, application/json or text/x-json
 +    Merb.available_mime_types.clear
 +    Merb.add_mime_type(:all,  nil,      %w[*/*])
@@ -415,7 +415,7 @@ index d17570786ca318cff7201c4b1e947ae229b01de8..ff9abe4d1c452aeabfcf5f7dc7a2c7cd
 
      # Any specific outgoing headers should be included here.  These are not
      # the content-type header but anything in addition to it.
--    # +tranform_method+ should be set to a symbol of the method used to
+-    # +transform_method+ should be set to a symbol of the method used to
 +    # +transform_method+ should be set to a symbol of the method used to
      # transform a resource into this mime type.
      # For example for the :xml mime type an object might be transformed by
@@ -433,7 +433,7 @@ index d17570786ca318cff7201c4b1e947ae229b01de8..ff9abe4d1c452aeabfcf5f7dc7a2c7cd
 -    # :text:: to_text, text/plain
 -    # :html:: to_html, text/html or application/xhtml+xml or application/html
 -    # :xml:: to_xml, application/xml or text/xml or application/x-xml, adds "Encoding: UTF-8" response header
--    # :js:: to_json, text/javascript ot application/javascript or application/x-javascript
+-    # :js:: to_json, text/javascript to application/javascript or application/x-javascript
 -    # :json:: to_json, application/json or text/x-json
 -    def reset_default_mime_types!
 -      available_mime_types.clear
@@ -509,15 +509,15 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
 -      # ==== Returns
 -      # The current list of formats provided for this instance of the controller. 
 -      # It starts with what has been set in the controller (or :html by default) 
--      # but can be modifed on a per-action basis.      
+-      # but can be modified on a per-action basis.      
 -      def _provided_formats
 -        @_provided_formats ||= class_provided_formats.dup
 +    end
 +
 +    # ==== Returns
 +    # The current list of formats provided for this instance of the controller. 
 +    # It starts with what has been set in the controller (or :html by default) 
-+    # but can be modifed on a per-action basis.      
++    # but can be modified on a per-action basis.      
 +    def _provided_formats
 +      @_provided_formats ||= class_provided_formats.dup
 +    end
@@ -531,7 +531,7 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
 +    #
 +    # ==== Raises
 +    # Merb::ResponderMixin::ContentTypeAlreadySet::
-+    #   Content negotiation already occured, and the content_type is set.
++    #   Content negotiation already occurred, and the content_type is set.
 +    #
 +    # ==== Returns
 +    # Array:: List of formats passed in
@@ -549,7 +549,7 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
 -      #
 -      # ==== Raises
 -      # Merb::ResponderMixin::ContentTypeAlreadySet::
--      #   Content negotiation already occured, and the content_type is set.
+-      #   Content negotiation already occurred, and the content_type is set.
 -      #
 -      # ==== Returns
 -      # Array:: List of formats passed in
@@ -574,7 +574,7 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
 +    #
 +    # ==== Raises
 +    # Merb::ResponderMixin::ContentTypeAlreadySet::
-+    #   Content negotiation already occured, and the content_type is set.
++    #   Content negotiation already occurred, and the content_type is set.
 +    #
 +    # ==== Returns
 +    # Array:: List of formats passed in
@@ -597,7 +597,7 @@ index e910b2b32c844ab51cf2a10d0ad26c314dbb3631..5ac67fb907aaf9f95effc7eb3cbb07b8
 -      #
 -      # ==== Raises
 -      # Merb::ResponderMixin::ContentTypeAlreadySet::
--      #   Content negotiation already occured, and the content_type is set.
+-      #   Content negotiation already occurred, and the content_type is set.
 -      #
 -      # ==== Returns
 -      # Array:: List of formats passed in