From 139595ec3e46c54b971534fea52240534d5d8b5a Mon Sep 17 00:00:00 2001 From: "tandrii@chromium.org" Date: Thu, 17 Mar 2016 16:41:34 +0000 Subject: [PATCH] Gerrit git cl: temporarily disable gerritissue setting. Reason: it breaks re-upload. R=andybons@chromium.org,machenbach@chromiu.org,mmentovai@chromium.org BUG= Review URL: https://codereview.chromium.org/1810683003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299354 0039d316-1c4b-4281-b951-d872f2087c98 --- git_cl.py | 2 -- tests/git_cl_test.py | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/git_cl.py b/git_cl.py index 1b6d4f4750..59e412123f 100755 --- a/git_cl.py +++ b/git_cl.py @@ -1328,8 +1328,6 @@ or verify this branch is set up to track another (via the --track argument to def _IssueSetting(self): """Return the git setting that stores this change's issue.""" - if settings.GetIsGerrit(): - return 'branch.%s.gerritissue' % self.GetBranch() return 'branch.%s.rietveldissue' % self.GetBranch() def _PatchsetSetting(self): diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index b034480afc..7da5aaefc0 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -321,7 +321,6 @@ class TestGitCl(TestCase): 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],), 'M\tPRESUBMIT.py'), - ((['git', 'config', 'gerrit.host'],), ''), ((['git', 'config', 'branch.working.rietveldissue'],), '12345'), ((['git', @@ -335,7 +334,6 @@ class TestGitCl(TestCase): @classmethod def _dcommit_calls_bypassed(cls): return [ - ((['git', 'config', 'gerrit.host'],), ''), ((['git', 'config', 'branch.working.rietveldissue'],), '12345'), ((['git', 'config', 'branch.working.rietveldserver'],), @@ -345,6 +343,7 @@ class TestGitCl(TestCase): @classmethod def _dcommit_calls_3(cls): return [ + ((['git', 'config', 'gerrit.host'],), ''), ((['git', 'diff', '--no-ext-diff', '--stat', '--find-copies-harder', '-l100000', '-C50', 'fake_ancestor_sha', @@ -570,7 +569,7 @@ class TestGitCl(TestCase): 'diff', '--name-status', '--no-renames', '-r', 'fake_ancestor_sha...', '.'],), 'M\t.gitignore\n'), - ((['git', 'config', 'branch.master.gerritissue'],), ''), + ((['git', 'config', 'branch.master.rietveldissue'],), ''), ((['git', 'config', 'branch.master.rietveldpatchset'],), ''), ((['git', @@ -663,7 +662,7 @@ class TestGitCl(TestCase): ] if squash: calls += [ - ((['git', 'config', 'branch.master.gerritissue', '123456'],), ''), + ((['git', 'config', 'branch.master.rietveldissue', '123456'],), ''), ((['git', 'rev-parse', 'HEAD'],), 'abcdef0123456789'), ((['git', 'update-ref', '-m', 'Uploaded abcdef0123456789', 'refs/heads/git_cl_uploads/master', 'abcdef0123456789'],),