From a0e45c6caeb84ccc3a24531c35f6bac3fd7c77b2 Mon Sep 17 00:00:00 2001
From: Otto Kekäläinen <otto@debian.org>
Date: Wed, 10 Jan 2024 23:08:40 +0800
Subject: gbp: Fix misc spelling in user visible output and comments

---
 gbp/git/repository.py | 6 +++---
 gbp/git/vfs.py        | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'gbp/git')

diff --git a/gbp/git/repository.py b/gbp/git/repository.py
index a8b4073e..972a058f 100644
--- a/gbp/git/repository.py
+++ b/gbp/git/repository.py
@@ -637,7 +637,7 @@ class GitRepository(object):
         """
         Get upstream branch for the local branch
 
-        @param local_branch: name fo the local branch
+        @param local_branch: name of the local branch
         @type local_branch: C{str}
         @return: upstream (remote/branch) or  '' if no upstream found
         @rtype: C{str}
@@ -1468,7 +1468,7 @@ class GitRepository(object):
             raise GbpError("Failed to move '%s' to '%s': %s" % (old, new, stderr.decode().rstrip()))
 #}
 
-#{ Comitting
+#{ Committing
 
     def _commit(self, msg, args=[], author_info=None):
         extra_env = author_info.get_author_env() if author_info else None
@@ -1672,7 +1672,7 @@ class GitRepository(object):
 
     def grep_log(self, regex, since=None, merges=True):
         """
-        Get commmits matching I{regex}
+        Get commits matching I{regex}
 
         @param regex: regular expression
         @type regex: C{str}
diff --git a/gbp/git/vfs.py b/gbp/git/vfs.py
index ec47201a..a94cabab 100644
--- a/gbp/git/vfs.py
+++ b/gbp/git/vfs.py
@@ -56,13 +56,13 @@ class GitVfs(object):
         def __exit__(self, exc_type, exc_val, exc_tb):
             self.close()
 
-    def __init__(self, repo, committish=None):
+    def __init__(self, repo, commitish=None):
         """
         @param repo: the git repository to act on
-        @param committish: the committish to act on
+        @param commitish: the commit-ish to act on
         """
         self._repo = repo
-        self._committish = committish or 'HEAD'
+        self._commitish = commitish or 'HEAD'
 
     def open(self, path, flags=None):
         flags = flags or 'r'
@@ -72,7 +72,7 @@ class GitVfs(object):
                 raise NotImplementedError("Flag '%s' unsupported so far" % flag)
         try:
             return GitVfs._File(self._repo.show(
-                "%s:%s" % (self._committish, path)),
+                "%s:%s" % (self._commitish, path)),
                 True if 'b' in flags else False)
         except GitRepositoryError as e:
             raise OSError(e)
-- 
cgit v1.2.3