InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix printing error on git-rebase failure

Browse Source 
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>
This commit is contained in:
Josip Sokcevic
2020-04-20 18:42:00 +00:00
committed by LUCI CQ
parent 4fef6b9ec7
commit 4511b131e6
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git_rebase_update.py
View File

@@ -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.