From edbf9a3e853be0f58240a36d3063e00d9d2d9ad1 Mon Sep 17 00:00:00 2001 From: tandrii Date: Thu, 16 Jun 2016 15:49:37 -0700 Subject: [PATCH] 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 --- git_cl.py | 12 ------------ tests/git_cl_test.py | 1 - 2 files changed, 13 deletions(-) diff --git a/git_cl.py b/git_cl.py index 0aafa85e1f..75be64e678 100755 --- a/git_cl.py +++ b/git_cl.py @@ -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) diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index 774f6f014c..b0048a11d9 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -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: