summaryrefslogtreecommitdiff
path: root/git/refs
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-10-21 00:33:43 +0200
committerGitHub <noreply@github.com>2016-10-21 00:33:43 +0200
commitafcd64ebbb770908bd2a751279ff070dea5bb97c (patch)
tree0674f49f45996d533890e0f67498a6038c590168 /git/refs
parentaab7dc2c7771118064334ee475dff8a6bb176b57 (diff)
parent66c41eb3b2b4130c7b68802dd2078534d1f6bf7a (diff)
downloadgitpython-afcd64ebbb770908bd2a751279ff070dea5bb97c.tar.gz
Merge pull request #539 from bryant1410/typos
Fix some typos
Diffstat (limited to 'git/refs')
-rw-r--r--git/refs/head.py5
-rw-r--r--git/refs/reference.py2
-rw-r--r--git/refs/remote.py2
-rw-r--r--git/refs/symbolic.py10
-rw-r--r--git/refs/tag.py2
5 files changed, 10 insertions, 11 deletions
diff --git a/git/refs/head.py b/git/refs/head.py
index a1d8ab46..9a9a8596 100644
--- a/git/refs/head.py
+++ b/git/refs/head.py
@@ -216,8 +216,7 @@ class Head(Reference):
else:
return self.repo.active_branch
- #{ Configruation
-
+ #{ Configuration
def _config_parser(self, read_only):
if read_only:
parser = self.repo.config_reader()
@@ -235,7 +234,7 @@ class Head(Reference):
def config_writer(self):
"""
- :return: A configuration writer instance with read-and write acccess
+ :return: A configuration writer instance with read-and write access
to options of this head"""
return self._config_parser(read_only=False)
diff --git a/git/refs/reference.py b/git/refs/reference.py
index cc99dc26..734ed8b9 100644
--- a/git/refs/reference.py
+++ b/git/refs/reference.py
@@ -20,7 +20,7 @@ def require_remote_ref_path(func):
# END wrapper
wrapper.__name__ = func.__name__
return wrapper
-#}END utilites
+#}END utilities
class Reference(SymbolicReference, LazyMixin, Iterable):
diff --git a/git/refs/remote.py b/git/refs/remote.py
index 1f256b75..b5318bc3 100644
--- a/git/refs/remote.py
+++ b/git/refs/remote.py
@@ -28,7 +28,7 @@ class RemoteReference(Head):
"""Delete the given remote references
:note:
- kwargs are given for compatability with the base class method as we
+ kwargs are given for comparability with the base class method as we
should not narrow the signature."""
repo.git.branch("-d", "-r", *refs)
# the official deletion method will ignore remote symbolic refs - these
diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
index ebaff8ca..00fb2fcd 100644
--- a/git/refs/symbolic.py
+++ b/git/refs/symbolic.py
@@ -111,7 +111,7 @@ class SymbolicReference(object):
return
# END no packed-refs file handling
# NOTE: Had try-finally block around here to close the fp,
- # but some python version woudn't allow yields within that.
+ # but some python version wouldn't allow yields within that.
# I believe files are closing themselves on destruction, so it is
# alright.
@@ -143,7 +143,7 @@ class SymbolicReference(object):
except (OSError, IOError):
# Probably we are just packed, find our entry in the packed refs file
# NOTE: We are not a symbolic ref if we are in a packed file, as these
- # are excluded explictly
+ # are excluded explicitly
for sha, path in cls._iter_packed_refs(repo):
if path != ref_path:
continue
@@ -264,7 +264,7 @@ class SymbolicReference(object):
symbolic one.
:param ref: SymbolicReference instance, Object instance or refspec string
- Only if the ref is a SymbolicRef instance, we will point to it. Everthing
+ Only if the ref is a SymbolicRef instance, we will point to it. Everything
else is dereferenced to obtain the actual object.
:param logmsg: If set to a string, the message will be used in the reflog.
Otherwise, a reflog entry is not written for the changed reference.
@@ -454,7 +454,7 @@ class SymbolicReference(object):
fd.writelines(l.encode(defenc) for l in new_lines)
except (OSError, IOError):
- pass # it didnt exist at all
+ pass # it didn't exist at all
# delete the reflog
reflog_path = RefLog.path(cls(repo, full_ref_path))
@@ -625,7 +625,7 @@ class SymbolicReference(object):
git.SymbolicReference[], each of them is guaranteed to be a symbolic
ref which is not detached and pointing to a valid ref
- List is lexigraphically sorted
+ List is lexicographically sorted
The returned objects represent actual subclasses, such as Head or TagReference"""
return (r for r in cls._iter_items(repo, common_path) if r.__class__ == SymbolicReference or not r.is_detached)
diff --git a/git/refs/tag.py b/git/refs/tag.py
index 11dbab97..cf41d971 100644
--- a/git/refs/tag.py
+++ b/git/refs/tag.py
@@ -9,7 +9,7 @@ class TagReference(Reference):
,a tag object or any other object. In the latter case additional information,
like the signature or the tag-creator, is available.
- This tag object will always point to a commit object, but may carray additional
+ This tag object will always point to a commit object, but may carry additional
information in a tag object::
tagref = TagReference.list_items(repo)[0]