fix universal_newlines TypeError

Fixes #1116

Author: x-santiaga-x

git/cmd.py

@@ -785,7 +785,9 @@ def _kill_process(pid):
                     watchdog.cancel()
                     if kill_check.isSet():
                         stderr_value = ('Timeout: the command "%s" did not complete in %d '
-                                        'secs.' % (" ".join(command), kill_after_timeout)).encode(defenc)
+                                        'secs.' % (" ".join(command), kill_after_timeout))
+                        if not universal_newlines:
+                            stderr_value = stderr_value.encode(defenc)
                 # strip trailing "\n"
                 if stdout_value.endswith(newline):
                     stdout_value = stdout_value[:-1]