git_common.py - Issue 1180673003: Make git-rebase-update a bit more robust

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 1180673003: Make git-rebase-update a bit more robust (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools

Patch Set: Created 5 years, 6 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:

Index: git_common.py

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

index a01f8e5694465219af083d5c4b12a5cbaca97a4b..a506fb851f208bbcac1a514d989d631bf6bf6dfb 100644

--- a/git_common.py

+++ b/git_common.py

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

return RebaseRet(True, '', '')

except subprocess2.CalledProcessError as cpe:

if abort:

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

+ run_with_retcode('rebase', '--abort') # ignore failure

return RebaseRet(False, cpe.stdout, cpe.stderr)

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