diff --git a/git_cl.py b/git_cl.py index e4a99259a5..c9d79782eb 100755 --- a/git_cl.py +++ b/git_cl.py @@ -4641,11 +4641,9 @@ def CMDdescription(parser, args): if not target_issue_arg.valid: parser.error('invalid codereview url or CL id') - auth_config = auth.extract_auth_config_from_options(options) - kwargs = { - 'auth_config': auth_config, - 'codereview': options.forced_codereview, + 'auth_config': auth.extract_auth_config_from_options(options), + 'codereview': options.forced_codereview, } detected_codereview_from_url = False if target_issue_arg: diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index 6149e45e94..8521e71389 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -1922,7 +1922,7 @@ class TestGitCl(TestCase): self.assertEqual( git_cl.main(['set-close', '--issue', '1', '--gerrit']), 0) - def test_description_gerrit(self): + def test_description(self): out = StringIO.StringIO() self.mock(git_cl.sys, 'stdout', out) self.calls = [ @@ -1931,7 +1931,7 @@ class TestGitCl(TestCase): ((['git', 'config', 'branch.feature.remote'],), 'origin'), ((['git', 'config', 'remote.origin.url'],), 'https://chromium.googlesource.com/my/repo'), - (('GetChangeDetail', 'code.review.org', + (('GetChangeDetail', 'chromium-review.googlesource.com', 'my%2Frepo~123123', ['CURRENT_REVISION', 'CURRENT_COMMIT']), { 'current_revision': 'sha1', @@ -1941,7 +1941,9 @@ class TestGitCl(TestCase): }), ] self.assertEqual(0, git_cl.main([ - 'description', 'https://code.review.org/123123', '-d', '--gerrit'])) + 'description', + 'https://chromium-review.googlesource.com/c/my/repo/+/123123', + '-d'])) self.assertEqual('foobar\n', out.getvalue()) def test_description_set_raw(self):