From 7044efcc7be5cd5be008d4d04d01ce7844c1b73d Mon Sep 17 00:00:00 2001 From: "ukai@chromium.org" Date: Thu, 28 Nov 2013 01:51:21 +0000 Subject: [PATCH] GERRIT_PORT is no longer used in git_cl.py BUG=maruel@chromium.org,szager@chromium.org Review URL: https://codereview.chromium.org/90763004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@237657 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl.py | 3 +-- tests/git_cl_test.py | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/git_cl.py b/git_cl.py index 5e166324f..90b054222 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1019,9 +1019,8 @@ def LoadCodereviewSettingsFromFile(fileobj): SetProperty('tree-status-url', 'STATUS', unset_error_ok=True) SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True) - if 'GERRIT_HOST' in keyvals and 'GERRIT_PORT' in keyvals: + if 'GERRIT_HOST' in keyvals: RunGit(['config', 'gerrit.host', keyvals['GERRIT_HOST']]) - RunGit(['config', 'gerrit.port', keyvals['GERRIT_PORT']]) if 'PUSH_URL_CONFIG' in keyvals and 'ORIGIN_URL_CONFIG' in keyvals: #should be of the form diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index dce632ea9..0cd6fea6f 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -662,7 +662,6 @@ class TestGitCl(TestCase): 'rietveld.viewvc-url'],), ''), ((['git', 'config', 'gerrit.host', 'gerrit.chromium.org'],), ''), - ((['git', 'config', 'gerrit.port', '29418'],), ''), # DownloadHooks(False) ((['git', 'config', 'gerrit.host'],), 'gerrit.chromium.org'),