Merge pull request #682 from pabelanger/temp/encoding

Byron · web-flow · commit f237620189a5 · 2017-10-07T07:37:56.000+02:00
Fix encoding issue with stderr_value and kill_after_timeout
diff --git a/git/cmd.py b/git/cmd.py
@@ -780,8 +780,8 @@ def _kill_process(pid):
                 if kill_after_timeout:
                     watchdog.cancel()
                     if kill_check.isSet():
-                        stderr_value = 'Timeout: the command "%s" did not complete in %d ' \
-                                       'secs.' % (" ".join(command), kill_after_timeout)
+                        stderr_value = ('Timeout: the command "%s" did not complete in %d '
+                                        'secs.' % (" ".join(command), kill_after_timeout)).encode(defenc)
                 # strip trailing "\n"
                 if stdout_value.endswith(b"\n"):
                     stdout_value = stdout_value[:-1]
