Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Unified Diff: tests/git_cl_test.py

Issue 10412027: Turn on git diff copy detection for git-cl upload. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: fix test Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « git_cl.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/git_cl_test.py
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index 29e5cc5f50ffea4447461542ff51bb3b52945d9c..489c75eb2dc8d93d6e379106ca90433e5d74b1b6 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -114,7 +114,7 @@ class TestGitCl(TestCase):
((['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', '-M', 'master...'],),
+ ((['git', 'diff', '--no-ext-diff', '--stat', '-C', '-C', 'master...'],),
'+dat'),
((['git', 'log', '--pretty=format:%s\n\n%b', 'master..'],), 'desc\n'),
]
@@ -217,7 +217,7 @@ class TestGitCl(TestCase):
'--message', description
] + args + [
'--cc', 'joe@example.com',
- 'master...'
+ 'master...', '--', '-C',
]
def _run_reviewer_test(
@@ -347,7 +347,7 @@ class TestGitCl(TestCase):
((['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', '-M', 'master...'],),
+ ((['git', 'diff', '--no-ext-diff', '--stat', '-C', '-C', 'master...'],),
'+dat'),
]
« no previous file with comments | « git_cl.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698