Index: git_cl.py |
diff --git a/git_cl.py b/git_cl.py |
index d2f4b31f3fa320bac98c347d7bc67c32d7e3af18..2c63d7330cafd947151134f864714f77e8e918b6 100755 |
--- a/git_cl.py |
+++ b/git_cl.py |
@@ -1019,10 +1019,7 @@ def RietveldUpload(options, args, cl): |
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 @@ def CMDupload(parser, args): |
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) |