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

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 json
 import os
 import StringIO
@@ skipping 385 matching lines @@
       find_copies = True
       find_copies_call = ((['git', 'config', '--bool',
                           'branch.master.git-find-copies'],), CERR1)
     else:
       val = str(find_copies).lower()
       find_copies_call = ((['git', 'config', '--bool',
                           'branch.master.git-find-copies', val],), '')
 
     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')
 
     return [
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       similarity_call,
       ((['git', 'symbolic-ref', 'HEAD'],), 'master'),
       find_copies_call,
     ] + cls._is_gerrit_calls() + [
@@ skipping 163 matching lines @@
   def _dcommit_calls_bypassed(cls):
     return [
       ((['git', 'config', 'branch.working.rietveldserver'],),
          'codereview.example.com'),
   ]
 
   @classmethod
   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',
          'refs/heads/git-cl-commit'],), ''),
       ((['git', 'branch', '-D', 'git-cl-commit'],), ''),
       ((['git', 'show-ref', '--quiet', '--verify',
          'refs/heads/git-cl-cherry-pick'],), CERR1),
       ((['git', 'rev-parse', '--show-cdup'],), '\n'),
       ((['git', 'checkout', '-q', '-b', 'git-cl-commit'],), ''),
       ((['git', 'reset', '--soft', 'fake_ancestor_sha'],), ''),
@@ skipping 246 matching lines @@
            'fake_ancestor_sha...', '.'],),
          'M\t.gitignore\n'),
         ((['git', 'config', 'branch.master.gerritpatchset'],), CERR1),
       ] + ([] if issue else [
         ((['git',
            'log', '--pretty=format:%s%n%n%b', 'fake_ancestor_sha...'],),
          'foo'),
       ]) + [
         ((['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'),
       ]
 
   @classmethod
   def _gerrit_upload_calls(cls, description, reviewers, squash,
                            squash_mode='default',
                            expected_upstream_ref='origin/refs/heads/master',
                            ref_suffix='', notify=False,
                            post_amend_description=None, issue=None, cc=None):
     if post_amend_description is None:
@@ skipping 1526 matching lines @@
     self.assertNotRegexpMatches(sys.stdout.getvalue(), 'Warning')
     self.assertRegexpMatches(sys.stdout.getvalue(), '^Failures:')
     self.assertRegexpMatches(sys.stdout.getvalue(), 'Started:')
     self.assertRegexpMatches(sys.stdout.getvalue(), '2 try jobs')
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()