Don't --find-copies-harder when printing informational diff, either

We're doing the diff twice afaict, once to print stats to the user, and
once to actually do the upload. Definitely no need to
--find-copies-harder in the print.

Previously: https://codereview.chromium.org/2488823002.

R=dpranke@chromium.org
BUG=544889

Review-Url: https://codereview.chromium.org/2489963003

git_cl.py

@@ -725,8 +725,7 @@ def print_stats(similarity, find_copies, args):
     del env['GIT_EXTERNAL_DIFF']
 
   if find_copies:
-    similarity_options = ['--find-copies-harder', '-l100000',
-                          '-C%s' % similarity]
+    similarity_options = ['-l100000', '-C%s' % similarity]
   else:
     similarity_options = ['-M%s' % similarity]
 

tests/git_cl_test.py

@@ -403,8 +403,8 @@ class TestGitCl(TestCase):
 
     if find_copies:
       stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
-                   '--find-copies-harder', '-l100000', '-C'+similarity,
-                   'fake_ancestor_sha', 'HEAD'],), '+dat')
+                     '-l100000', '-C'+similarity,
+                     'fake_ancestor_sha', 'HEAD'],), '+dat')
     else:
       stat_call = ((['git', 'diff', '--no-ext-diff', '--stat',
                    '-M'+similarity, 'fake_ancestor_sha', 'HEAD'],), '+dat')
@@ -588,9 +588,8 @@ class TestGitCl(TestCase):
   def _dcommit_calls_3(cls):
     return [
       ((['git',
-         'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
-         '-l100000', '-C50', 'fake_ancestor_sha',
-         'refs/heads/working'],),
+         'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
+         'fake_ancestor_sha', 'refs/heads/working'],),
        (' PRESUBMIT.py |    2 +-\n'
         ' 1 files changed, 1 insertions(+), 1 deletions(-)\n')),
       ((['git', 'show-ref', '--quiet', '--verify',
@@ -857,8 +856,8 @@ class TestGitCl(TestCase):
       ]) + [
         ((['git', 'config', 'user.email'],), 'me@example.com'),
         ((['git',
-           'diff', '--no-ext-diff', '--stat', '--find-copies-harder',
-           '-l100000', '-C50', 'fake_ancestor_sha', 'HEAD'],),
+           'diff', '--no-ext-diff', '--stat', '-l100000', '-C50',
+           'fake_ancestor_sha', 'HEAD'],),
          '+dat'),
       ]