| commit | 4511b131e6966f87a8d60e2965df3b65b74d1069 | [log] [tgz] |
|---|---|---|
| author | Josip Sokcevic <sokcevic@google.com> | Mon Apr 20 18:42:00 2020 +0000 |
| committer | LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> | Mon Apr 20 18:42:00 2020 +0000 |
| tree | b2e6ef5bd054695f138c36a7a229e92fee116938 | |
| parent | 4fef6b9ec71e3e0e256c13cbb5e538c536a02889 [diff] [blame] |
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 <ehmaldonado@chromium.org> Commit-Queue: Josip Sokcevic <sokcevic@google.com>
diff --git a/git_rebase_update.py b/git_rebase_update.py index b02ad73..d9a4e91 100755 --- a/git_rebase_update.py +++ b/git_rebase_update.py
@@ -197,8 +197,8 @@ 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.