diff options
| author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-22 12:47:45 +0200 |
|---|---|---|
| committer | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-22 12:47:45 +0200 |
| commit | a25365fea0ea3b92ba96cc281facd308311def1e (patch) | |
| tree | 5653a9923aebfc8b53407f8d1ef0d9d6497da081 /git/repo/fun.py | |
| parent | 76ac61a2b4bb10c8434a7d6fc798b115b4b7934d (diff) | |
| parent | caa0ea7a0893fe90ea043843d4e6ad407126d7b8 (diff) | |
| download | gitpython-a25365fea0ea3b92ba96cc281facd308311def1e.tar.gz | |
Merge remote-tracking branch 'origin/master' into exp_git_dir
Diffstat (limited to 'git/repo/fun.py')
| -rw-r--r-- | git/repo/fun.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git/repo/fun.py b/git/repo/fun.py index 41e7ad3f..39e55880 100644 --- a/git/repo/fun.py +++ b/git/repo/fun.py @@ -253,8 +253,8 @@ def rev_parse(repo, rev): # empty output types don't require any specific type, its just about dereferencing tags if output_type and obj.type != output_type: - raise ValueError("Could not accomodate requested object type %r, got %s" % (output_type, obj.type)) - # END verify ouput type + raise ValueError("Could not accommodate requested object type %r, got %s" % (output_type, obj.type)) + # END verify output type start = end + 1 # skip brace parsed_to = start @@ -283,7 +283,7 @@ def rev_parse(repo, rev): # END number parsing only if non-blob mode parsed_to = start - # handle hiererarchy walk + # handle hierarchy walk try: if token == "~": obj = to_commit(obj) |