Revert "Turn on git diff copy detection for git-cl upload."
This reverts commit db5a0def789d6fc1392358da1456b5247473788c.
TBR=maruel@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10532034
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@140808 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index c3fdb07..e0705fa 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -114,7 +114,7 @@
((['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'),
]
@@ -217,7 +217,7 @@
'--message', description
] + args + [
'--cc', 'joe@example.com',
- 'master...', '--', '-C',
+ 'master...'
]
def _run_reviewer_test(
@@ -347,7 +347,7 @@
((['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'),
]