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

Unified Diff: tests/git_cl_test.py

Issue 13884014: Ensures that local git config is used while checking if it is a Git-svn repo. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: Created 7 years, 8 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 58508bf45275405f8362232dcaf02acc01024454..a890dac4f3edad5a06db9e1f03ad3f946eba0a70 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -171,7 +171,7 @@ class TestGitCl(TestCase):
return [
((['git', 'config', 'rietveld.cc'],), ''),
((['git', 'config', 'branch.master.base-url'],), ''),
- ((['git', 'config', '--get-regexp', '^svn-remote\\.'],),
+ ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
(('', None), 0)),
((['git', 'rev-parse', '--show-cdup'],), ''),
((['git', 'svn', 'info'],), ''),
@@ -206,7 +206,7 @@ class TestGitCl(TestCase):
@classmethod
def _dcommit_calls_1(cls):
return [
- ((['git', 'config', '--get-regexp', '^svn-remote\\.'],),
+ ((['git', 'config', '--local', '--get-regexp', '^svn-remote\\.'],),
((('svn-remote.svn.url svn://svn.chromium.org/chrome\n'
'svn-remote.svn.fetch trunk/src:refs/remotes/origin/master'),
None),
« 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