summaryrefslogtreecommitdiff
path: root/git/objects/tree.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/objects/tree.py
parent76ac61a2b4bb10c8434a7d6fc798b115b4b7934d (diff)
parentcaa0ea7a0893fe90ea043843d4e6ad407126d7b8 (diff)
downloadgitpython-a25365fea0ea3b92ba96cc281facd308311def1e.tar.gz
Merge remote-tracking branch 'origin/master' into exp_git_dir
Diffstat (limited to 'git/objects/tree.py')
-rw-r--r--git/objects/tree.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/git/objects/tree.py b/git/objects/tree.py
index 46fe63e7..ed7c2435 100644
--- a/git/objects/tree.py
+++ b/git/objects/tree.py
@@ -77,7 +77,7 @@ class TreeModifier(object):
"""A utility class providing methods to alter the underlying cache in a list-like fashion.
- Once all adjustments are complete, the _cache, which really is a refernce to
+ Once all adjustments are complete, the _cache, which really is a reference to
the cache of a tree, will be sorted. Assuring it will be in a serializable state"""
__slots__ = '_cache'
@@ -294,7 +294,7 @@ class Tree(IndexObject, diff.Diffable, util.Traversable, util.Serializable):
return self._map_id_to_type[info[1] >> 12](self.repo, info[0], info[1], join_path(self.path, info[2]))
if isinstance(item, string_types):
- # compatability
+ # compatibility
return self.join(item)
# END index is basestring
@@ -308,7 +308,7 @@ class Tree(IndexObject, diff.Diffable, util.Traversable, util.Serializable):
# END compare sha
# END for each entry
# END handle item is index object
- # compatability
+ # compatibility
# treat item as repo-relative path
path = self.path