scm.py - Issue 1958002: Prevent git from using any external diff program that may have been...

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: scm.py

Issue 1958002: Prevent git from using any external diff program that may have been... (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/depot_tools/

Patch Set: Created 10 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: scm.py

===================================================================

--- scm.py (revision 46361)

+++ scm.py (working copy)

@@ -255,7 +255,8 @@

files, usually in the prospect to apply the patch for a try job."""

if not branch:

branch = GIT.GetUpstreamBranch(cwd)

- command = ['diff', '-p', '--no-prefix', branch + "..." + branch_head]

+ command = ['diff', '-p', '--no-prefix', '--no-ext-diff',

+ branch + "..." + branch_head]

if not full_move:

command.append('-C')

# TODO(maruel): --binary support.

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