summaryrefslogtreecommitdiff
path: root/git/cmd.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/cmd.py
parent76ac61a2b4bb10c8434a7d6fc798b115b4b7934d (diff)
parentcaa0ea7a0893fe90ea043843d4e6ad407126d7b8 (diff)
downloadgitpython-a25365fea0ea3b92ba96cc281facd308311def1e.tar.gz
Merge remote-tracking branch 'origin/master' into exp_git_dir
Diffstat (limited to 'git/cmd.py')
-rw-r--r--git/cmd.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/git/cmd.py b/git/cmd.py
index 2d244036..72ba82c3 100644
--- a/git/cmd.py
+++ b/git/cmd.py
@@ -69,10 +69,10 @@ def handle_process_output(process, stdout_handler, stderr_handler,
:return: result of finalizer
:param process: subprocess.Popen instance
:param stdout_handler: f(stdout_line_string), or None
- :param stderr_hanlder: f(stderr_line_string), or None
+ :param stderr_handler: f(stderr_line_string), or None
:param finalizer: f(proc) - wait for proc to finish
:param decode_streams:
- Assume stdout/stderr streams are binary and decode them vefore pushing \
+ Assume stdout/stderr streams are binary and decode them before pushing \
their contents to handlers.
Set it to False if `universal_newline == True` (then streams are in text-mode)
or if decoding must happen later (i.e. for Diffs).
@@ -438,7 +438,7 @@ class Git(LazyMixin):
def _set_cache_(self, attr):
if attr == '_version_info':
- # We only use the first 4 numbers, as everthing else could be strings in fact (on windows)
+ # We only use the first 4 numbers, as everything else could be strings in fact (on windows)
version_numbers = self._call_process('version').split(' ')[2]
self._version_info = tuple(int(n) for n in version_numbers.split('.')[:4] if n.isdigit())
else: