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

tests/git_cl_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 96 matching lines @@
       ((['git', 'config', 'branch.master.merge'],), 'master'),
       ((['git', 'config', 'branch.master.remote'],), 'origin'),
       ((['git', 'rev-parse', '--show-cdup'],), ''),
       ((['git', 'rev-parse', 'HEAD'],), '12345'),
       ((['git', 'diff', '--name-status', '-r', 'master...', '.'],),
         'M\t.gitignore\n'),
       ((['git', 'config', 'branch.master.rietveldissue'],), ''),
       ((['git', 'config', 'branch.master.rietveldpatchset'],), ''),
       ((['git', 'log', '--pretty=format:%s%n%n%b', 'master...'],), 'foo'),
       ((['git', 'config', 'user.email'],), 'me@example.com'),
-      ((['git', 'diff', '--no-ext-diff', '--stat', '-C', '-C', 'master...'],),
+      ((['git', 'diff', '--no-ext-diff', '--stat', '-M', 'master...'],),
        '+dat'),
       ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],), 'desc\n'),
     ]
 
   @staticmethod
   def _git_upload_calls():
     return [
       ((['git', 'config', 'rietveld.cc'],), ''),
       ((['git', 'config', 'branch.master.base-url'],), ''),
       ((['git', 'config', '--get-regexp', '^svn-remote\\.'],),
@@ skipping 82 matching lines @@
 
   @staticmethod
   def _cmd_line(description, args):
     """Returns the upload command line passed to upload.RealMain()."""
     return [
         'upload', '--assume_yes', '--server',
         'https://codereview.example.com',
         '--message', description
     ] + args + [
         '--cc', 'joe@example.com',
-        'master...', '--', '-C',
+        'master...'
     ]
 
   def _run_reviewer_test(
       self,
       upload_args,
       expected_description,
       returned_description,
       final_description,
       reviewers):
     """Generic reviewer test framework."""
@@ skipping 109 matching lines @@
         ((['git', 'config', 'branch.master.merge'],), 'master'),
         ((['git', 'config', 'branch.master.remote'],), 'origin'),
         ((['git', 'rev-parse', '--show-cdup'],), ''),
         ((['git', 'rev-parse', 'HEAD'],), '12345'),
         ((['git', 'diff', '--name-status', '-r', 'master...', '.'],),
          'M\t.gitignore\n'),
         ((['git', 'config', 'branch.master.rietveldissue'],), ''),
         ((['git', 'config', 'branch.master.rietveldpatchset'],), ''),
         ((['git', 'log', '--pretty=format:%s%n%n%b', 'master...'],), 'foo'),
         ((['git', 'config', 'user.email'],), 'me@example.com'),
-        ((['git', 'diff', '--no-ext-diff', '--stat', '-C', '-C', 'master...'],),
+        ((['git', 'diff', '--no-ext-diff', '--stat', '-M', 'master...'],),
          '+dat'),
         ]
 
   @staticmethod
   def _gerrit_upload_calls(description, reviewers):
     calls = [
         ((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],),
          description),
         ((['git', 'config', 'rietveld.cc'],), '')
         ]
@@ skipping 90 matching lines @@
         ((['git', 'config', 'rietveld.viewvc-url'],), ''),
         (('ViewVC URL:',), ''),
         # DownloadHooks(True)
         ((commit_msg_path, os.X_OK,), True),
         ]
     git_cl.main(['config'])
 
 
 if __name__ == '__main__':
   unittest.main()