Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(679)

Unified Diff: scm.py

Issue 16057018: Pass --no-renames to git diff (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/depot_tools/
Patch Set: Created 7 years, 7 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
« no previous file with comments | « no previous file | tests/git_cl_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scm.py
===================================================================
--- scm.py (revision 203755)
+++ scm.py (working copy)
@@ -113,7 +113,8 @@
upstream_branch = GIT.GetUpstreamBranch(cwd)
if upstream_branch is None:
raise gclient_utils.Error('Cannot determine upstream branch')
- command = ['diff', '--name-status', '-r', '%s...' % upstream_branch]
+ command = ['diff', '--name-status', '--no-renames',
+ '-r', '%s...' % upstream_branch]
if not files:
pass
elif isinstance(files, basestring):
@@ -346,7 +347,9 @@
branch = GIT.GetUpstreamBranch(cwd)
command = ['diff', '-p', '--no-color', '--no-prefix', '--no-ext-diff',
branch + "..." + branch_head]
- if not full_move:
+ if full_move:
+ command.append('--no-renames')
+ else:
command.append('-C')
# TODO(maruel): --binary support.
if files:
« no previous file with comments | « no previous file | tests/git_cl_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698