git_cl.py - Issue 889093002: Allow branch name to be the same as directory name for "git cl diff"

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

Issue 889093002: Allow branch name to be the same as directory name for "git cl diff" (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: revert "follow coding convention of the file" Created 5 years, 11 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_cl.py

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

index 4edb6a0af8e1ee834f7f8305e92e435a3c1f9cee..9e1471996bcea50a0fe8ecaefe1e363e6a3e29f6 100755

--- a/git_cl.py

+++ b/git_cl.py

@@ -2785,9 +2785,9 @@ def CMDdiff(parser, args):

if rtn != 0:

return rtn

- # Switch back to starting brand and diff against the temporary

+ # Switch back to starting branch and diff against the temporary

# branch containing the latest rietveld patch.

- subprocess2.check_call(['git', 'diff', TMP_BRANCH, branch])

+ subprocess2.check_call(['git', 'diff', TMP_BRANCH, branch, '--'])

finally:

RunGit(['checkout', '-q', branch])

RunGit(['branch', '-D', TMP_BRANCH])

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