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

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 2320 matching lines @@
       if reply.lower().startswith('y'):
         gclient_utils.rm_file_or_tree(hook)
         print('Gerrit commit-msg hook removed.')
       else:
         print('OK, will keep Gerrit commit-msg hook in place.')
 
   def CMDUploadChange(self, options, args, change):
     """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)
 
     # We assume the remote called "origin" is the one we want.
     # It is probably not worthwhile to support different workflows.
     gerrit_remote = 'origin'
 
     remote, remote_branch = self.GetRemoteBranch()
     branch = GetTargetRef(remote, remote_branch, options.target_branch,
                           pending_prefix='')
@@ skipping 2664 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)