git_rebase_update.py - Issue 311243003: Make git-freeze bail out if the user has too much untracked data.

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 311243003: Make git-freeze bail out if the user has too much untracked data. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Address comments Created 6 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:

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 f87f43b873fba4a05cace6e1f173e74e2058930c..4b5c73757aedfb3895f2a09ff168cba27b0d64bd 100755

--- a/git_rebase_update.py

+++ b/git_rebase_update.py

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

This value may persist across multiple invocations of rebase-update, if

rebase-update runs into a conflict mid-way.

"""

- return_branch = git.config(STARTING_BRANCH_KEY)

+ return_branch = git.get_config(STARTING_BRANCH_KEY)

if not return_branch:

return_branch = git.current_branch()

if return_branch != 'HEAD':

« no previous file with comments | « git_map.py ('k') | git_upstream_diff.py » ('j') | no next file with comments »