# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2020-10-30 23:44:18
# Node ID 3669e58f3002325ce06aac73d945fc067fafc8a4
# Parent  6bde1c0a04d4be70345ea14d63475b936d558043
# Parent  c387989f868f2d7712de7c4de351969c502cd1fd

Merge stable

diff --git a/kallithea/config/middleware/pygrack.py b/kallithea/config/middleware/pygrack.py
--- a/kallithea/config/middleware/pygrack.py
+++ b/kallithea/config/middleware/pygrack.py
@@ -127,7 +127,7 @@ class GitRepository(object):
             log.error(traceback.format_exc())
             raise exc.HTTPExpectationFailed()
         resp = Response()
-        resp.content_type = 'application/x-%s-advertisement' % str(git_command)
+        resp.content_type = 'application/x-%s-advertisement' % git_command
         resp.charset = None
         resp.app_iter = out
         return resp
@@ -177,7 +177,7 @@ class GitRepository(object):
                 update_server_info(repo._repo)
 
         resp = Response()
-        resp.content_type = 'application/x-%s-result' % git_command.encode('utf-8')
+        resp.content_type = 'application/x-%s-result' % git_command
         resp.charset = None
         resp.app_iter = out
         return resp