commit db9b0e3a04439010e3f577458a53c5f5dac16808
author cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jun 06 19:10:17 2012 +0000
committer cmp@chromium.org <cmp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jun 06 19:10:17 2012 +0000
tree fd6079d2a3f0247325be3b7f222fa13e7f7b0968
parent d4af662bd67b436cdbe8bf3b0ee827ce79b6c967

Revert "Turn on git diff copy detection for git-cl upload."

This reverts commit db5a0def789d6fc1392358da1456b5247473788c.

TBR=maruel@chromium.org


Review URL: https://chromiumcodereview.appspot.com/10532034

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140808 0039d316-1c4b-4281-b951-d872f2087c98

git_cl.py

diff --git a/git_cl.py b/git_cl.py
index d2f4b31..2c63d73 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1019,10 +1019,7 @@
     upload_args.extend(['--base_url', remote_url])
 
   try:
-    # upload uses '-C' by default when generating the diff for upload.
-    # Add another '-C' to trigger --find-copies-harder.
-    issue, patchset = upload.RealMain(['upload'] + upload_args + args +
-                                      ['--', '-C'])
+    issue, patchset = upload.RealMain(['upload'] + upload_args + args)
   except KeyboardInterrupt:
     sys.exit(1)
   except:
@@ -1115,7 +1112,7 @@
   if 'GIT_EXTERNAL_DIFF' in env:
     del env['GIT_EXTERNAL_DIFF']
   subprocess2.call(
-      ['git', 'diff', '--no-ext-diff', '--stat', '-C', '-C'] + args, env=env)
+      ['git', 'diff', '--no-ext-diff', '--stat', '-M'] + args, env=env)
 
   if settings.GetIsGerrit():
     return GerritUpload(options, args, cl)