From 8a52fd0e8bcf15fc5994faec276859449bb26f70 Mon Sep 17 00:00:00 2001 From: Jake Stine Date: Mon, 15 Mar 2021 13:31:36 -0700 Subject: [PATCH] Fix an encoding error where revision svn is expected as bytes, not str. --- rbtools/clients/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rbtools/clients/git.py b/rbtools/clients/git.py index be4cbf18..61b23678 100644 --- a/rbtools/clients/git.py +++ b/rbtools/clients/git.py @@ -888,7 +888,7 @@ def make_svn_diff(self, merge_base, diff_lines): bytes: The reformatted diff contents. """ - rev = self._execute([self.git, 'svn', 'find-rev', merge_base]).strip() + rev = self._execute([self.git, 'svn', 'find-rev', merge_base], results_unicode=False).strip() if not rev: return None