summaryrefslogtreecommitdiff
path: root/git/refs/symbolic.py
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-10-22 12:47:45 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-10-22 12:47:45 +0200
commita25365fea0ea3b92ba96cc281facd308311def1e (patch)
tree5653a9923aebfc8b53407f8d1ef0d9d6497da081 /git/refs/symbolic.py
parent76ac61a2b4bb10c8434a7d6fc798b115b4b7934d (diff)
parentcaa0ea7a0893fe90ea043843d4e6ad407126d7b8 (diff)
downloadgitpython-a25365fea0ea3b92ba96cc281facd308311def1e.tar.gz
Merge remote-tracking branch 'origin/master' into exp_git_dir
Diffstat (limited to 'git/refs/symbolic.py')
-rw-r--r--git/refs/symbolic.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/git/refs/symbolic.py b/git/refs/symbolic.py
index 3a93d81c..3c6b78e5 100644
--- a/git/refs/symbolic.py
+++ b/git/refs/symbolic.py
@@ -105,7 +105,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.
@@ -137,7 +137,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
@@ -258,7 +258,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.
@@ -448,7 +448,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))
@@ -619,7 +619,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)