From fef5cf8e227b8c515bb320f7b2cf5e270ed5263f Mon Sep 17 00:00:00 2001 From: Wez Date: Thu, 23 Apr 2020 06:40:49 +0000 Subject: [PATCH] Revert "Fix printing error on git-rebase failure" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 4511b131e6966f87a8d60e2965df3b65b74d1069. Reason for revert: Broke git_rebase_update.py under Python3, which does not support calling decode() on string objects. Original change's description: > 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 TBR=ehmaldonado@chromium.org,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,sokcevic@google.com # Not skipping CQ checks because original CL landed > 1 day ago. Bug: 1071280, 1073768 Change-Id: I58c1b24ba2aef255068c81be25475b2abbbf4fcb Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2161111 Reviewed-by: Wez Commit-Queue: Wez --- 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 d9a4e91a0..b02ad73c2 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.decode('utf-8')) - print(squash_ret.stderr.decode('utf-8')) + print(squash_ret.stdout) + print(squash_ret.stderr) print(textwrap.dedent("""\ Squashing failed. You probably have a real merge conflict.