git_common.py - Issue 212493003: Fix the print of the rebase error message, and make the output prettier too.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: git_common.py

Issue 212493003: Fix the print of the rebase error message, and make the output prettier too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: git_common.py

diff --git a/git_common.py b/git_common.py

index d87fc3aef903c46e2c2dcd2db3e2217e48badeb7..0ccfb010550c0d84cadd60a6ef697cae78ae072b 100644

--- a/git_common.py

+++ b/git_common.py

@@ -448,7 +448,7 @@ def rebase(parent, start, branch, abort=False):

except subprocess2.CalledProcessError as cpe:

if abort:

run('rebase', '--abort')

- return RebaseRet(False, cpe.output)

+ return RebaseRet(False, cpe.stdout)

def remove_merge_base(branch):

« no previous file with comments | « no previous file | git_rebase_update.py » ('j') | no next file with comments »