git_upstream_diff.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_upstream_diff.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_upstream_diff.py

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

index 9d9db95fd5d64bb1703f15dd38aa6c9270565370..88fc335c3c7468766188ca6b3891ee9c834c9d6f 100755

--- a/git_upstream_diff.py

+++ b/git_upstream_diff.py

@@ -11,7 +11,7 @@ import subprocess2

import git_common as git

def main(args):

- default_args = git.config_list('depot-tools.upstream-diff.default-args')

+ default_args = git.get_config_list('depot-tools.upstream-diff.default-args')

args = default_args + args

parser = argparse.ArgumentParser()

« no previous file with comments | « git_rebase_update.py ('k') | man/html/git-freeze.html » ('j') | no next file with comments »