git_rebase_update.py - Issue 228353003: Fix empty section appearing in git config for every rebase-update.

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_rebase_update.py

Issue 228353003: Fix empty section appearing in git config for every rebase-update. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Created 6 years, 8 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_rebase_update.py

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

index b0c5bf4dc31cffc33bceb547fa7141469eacb5c0..4e96c69898b6b2905f1977305fea673f4ccd0093 100755

--- a/git_rebase_update.py

+++ b/git_rebase_update.py

@@ -28,7 +28,7 @@ def find_return_branch():

rebase-update runs into a conflict mid-way.

"""

return_branch = git.config(STARTING_BRANCH_KEY)

- if return_branch is None:

+ if not return_branch:

return_branch = git.current_branch()

if return_branch != 'HEAD':

git.set_config(STARTING_BRANCH_KEY, return_branch)

@@ -244,7 +244,7 @@ def main(args=()):

% (return_branch, root_branch)

)

git.run('checkout', root_branch)

- git.del_config(STARTING_BRANCH_KEY)

+ git.set_config(STARTING_BRANCH_KEY, '')

return retcode

« no previous file with comments | « no previous file | no next file » | no next file with comments »