Commit edbf9a3e authored by tandrii's avatar tandrii Committed by Commit bot

Gerrit git cl upload: Remove --no-squash warning message.

First, it's wrong because of instruction in it is ineffective.
Second, it was also shown during --squash upload, which is completely wrong.

TBR=sergiyb@chromium.org
BUG=611892

Review-Url: https://codereview.chromium.org/2072923002
parent 8dd81ea2
......@@ -2338,18 +2338,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
"""Upload the current branch to Gerrit."""
if options.squash and options.no_squash:
DieWithError('Can only use one of --squash or --no-squash')
# TODO(tandrii): remove this by June 20.
if (RunGit(['config', '--bool', 'gerrit.squash-uploads'],
error_ok=True).strip() != 'false' and not options.squash and
not options.no_squash):
print('\n\nHi! You are using git cl upload in --no-squash mode.\n'
'Chrome infrastructure wants to make --squash the default.\n'
'To ensure that --no-squash is still the default for YOU do:\n'
' git config --bool gerrit.squash-uploads false\n'
'See https://goo.gl/dnK2gV (use chromium.org account!) and '
'let us know what you think. Thanks!\n'
'BUG: http://crbug.com/611892\n\n')
options.squash = ((settings.GetSquashGerritUploads() or options.squash) and
not options.no_squash)
......
......@@ -765,7 +765,6 @@ class TestGitCl(TestCase):
calls = [
((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
((['git', 'config', '--bool', 'gerrit.squash-uploads'],), 'false'),
]
# If issue is given, then description is fetched from Gerrit instead.
if issue is None:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment