summaryrefslogtreecommitdiff
path: root/git/diff.py
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-09-28 05:46:50 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-09-28 17:13:34 +0200
commit44c6d0b368bc1ec6cd0a97b01678b38788c9bd9c (patch)
treead44c36bf3527711f4dec4417f465af8ef2b5308 /git/diff.py
parentf11fdf1d9d22a198511b02f3ca90146cfa5deb5c (diff)
downloadgitpython-44c6d0b368bc1ec6cd0a97b01678b38788c9bd9c.tar.gz
Proc, #519: Rework error-exc msgs & log thread-pumps errors
+ No WindowsError exception. + Add `test_exc.py` for unicode issues. + Single-arg for decoding-streams in pump-func.
Diffstat (limited to 'git/diff.py')
-rw-r--r--git/diff.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/git/diff.py b/git/diff.py
index 54804c45..35c7ff86 100644
--- a/git/diff.py
+++ b/git/diff.py
@@ -407,7 +407,7 @@ class Diff(object):
## FIXME: Here SLURPING raw, need to re-phrase header-regexes linewise.
text = []
- handle_process_output(proc, text.append, None, finalize_process, decode_stdout=False)
+ handle_process_output(proc, text.append, None, finalize_process, decode_streams=False)
# for now, we have to bake the stream
text = b''.join(text)
@@ -499,6 +499,6 @@ class Diff(object):
new_file, deleted_file, rename_from, rename_to, '', change_type)
index.append(diff)
- handle_process_output(proc, handle_diff_line, None, finalize_process, decode_stdout=False)
+ handle_process_output(proc, handle_diff_line, None, finalize_process, decode_streams=False)
return index