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
diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index b034480..7da5aae 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -321,7 +321,6 @@
'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 @@
@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 @@
@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 @@
'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 @@
]
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'],),