From 4511b131e6966f87a8d60e2965df3b65b74d1069 Mon Sep 17 00:00:00 2001 From: Josip Sokcevic Date: Mon, 20 Apr 2020 18:42:00 +0000 Subject: [PATCH] Fix printing error on git-rebase failure R=ehmaldonado@chromium.org Bug: 1071280 Change-Id: I8b1f00bb7c454297b10d5e047ae35c2686f69fb1 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2155154 Reviewed-by: Edward Lesmes Commit-Queue: Josip Sokcevic --- git_rebase_update.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git_rebase_update.py b/git_rebase_update.py index b02ad73c29..d9a4e91a06 100755 --- a/git_rebase_update.py +++ b/git_rebase_update.py @@ -197,8 +197,8 @@ def rebase_branch(branch, parent, start_hash): else: print("Here's what git-rebase (squashed) had to say:") print() - print(squash_ret.stdout) - print(squash_ret.stderr) + print(squash_ret.stdout.decode('utf-8')) + print(squash_ret.stderr.decode('utf-8')) print(textwrap.dedent("""\ Squashing failed. You probably have a real merge conflict.