diff --git a/git_cl.py b/git_cl.py index 5d4a6b96eb..3f26f217f2 100755 --- a/git_cl.py +++ b/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] diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index d0f460de32..dcd530865b 100755 --- a/tests/git_cl_test.py +++ b/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'), ]