Remove hack to make --message argument act like --title argument in the

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."""
 
 import json
@@ skipping 1220 matching lines @@
   upload_args = ['--assume_yes']  # Don't ask about untracked files.
   upload_args.extend(['--server', cl.GetRietveldServer()])
   if options.emulate_svn_auto_props:
     upload_args.append('--emulate_svn_auto_props')
 
   change_desc = None
 
   if cl.GetIssue():
     if options.title:
       upload_args.extend(['--title', options.title])
-    elif options.message:
-      # TODO(rogerta): for now, the -m option will also set the --title option
-      # for upload.py.  Soon this will be changed to set the --message option.
-      # Will wait until people are used to typing -t instead of -m.
-      upload_args.extend(['--title', options.message])
+    if options.message:
+      upload_args.extend(['--message', options.message])
     upload_args.extend(['--issue', str(cl.GetIssue())])
     print ("This branch is associated with issue %s. "
            "Adding patch to that issue." % cl.GetIssue())
   else:
     if options.title:
       upload_args.extend(['--title', options.title])
     message = options.title or options.message or CreateDescriptionFromLog(args)
     change_desc = ChangeDescription(message)
     if options.reviewers:
       change_desc.update_reviewers(options.reviewers)
@@ skipping 99 matching lines @@
                     help='tell the commit queue to commit this patchset')
   parser.add_option('--target_branch',
                     help='When uploading to gerrit, remote branch to '
                          'use for CL.  Default: master')
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
 
   if options.target_branch and not settings.GetIsGerrit():
     parser.error('Use --target_branch for non gerrit repository.')
 
-  # Print warning if the user used the -m/--message argument.  This will soon
-  # change to -t/--title.
-  if options.message:
-    print >> sys.stderr, (
-        '\nWARNING: Use -t or --title to set the title of the patchset.\n'
-        'In the near future, -m or --message will send a message instead.\n'
-        'See http://goo.gl/JGg0Z for details.\n')
-
   if is_dirty_git_tree('upload'):
     return 1
 
   options.reviewers = cleanup_list(options.reviewers)
   options.cc = cleanup_list(options.cc)
 
   cl = Changelist()
   if args:
     # TODO(ukai): is it ok for gerrit case?
     base_branch = args[0]
@@ skipping 708 matching lines @@
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))