Added hyphen-only options

git_cache.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """A git command for managing a local cache of git repositories."""
 
 from __future__ import print_function
 import errno
 import logging
@@ skipping 504 matching lines @@
   # Lets just assert we can't do this on Windows.
   if sys.platform.startswith('win'):
     print('Sorry, update bootstrap will not work on Windows.', file=sys.stderr)
     return 1
 
   parser.add_option('--prune', action='store_true',
                     help='Prune all other cached zipballs of the same repo.')
 
   # First, we need to ensure the cache is populated.
   populate_args = args[:]
-  populate_args.append('--no_bootstrap')
+  populate_args.append('--no-bootstrap')
   CMDpopulate(parser, populate_args)
 
   # Get the repo directory.
   options, args = parser.parse_args(args)
   url = args[0]
   mirror = Mirror(url)
   mirror.update_bootstrap(options.prune)
   return 0
 
 
 @subcommand.usage('[url of repo to add to or update in cache]')
 def CMDpopulate(parser, args):
   """Ensure that the cache has all up-to-date objects for the given repo."""
   parser.add_option('--depth', type='int',
                     help='Only cache DEPTH commits of history')
   parser.add_option('--shallow', '-s', action='store_true',
                     help='Only cache 10000 commits of history')
   parser.add_option('--ref', action='append',
                     help='Specify additional refs to be fetched')
-  parser.add_option('--no_bootstrap', action='store_true',
+  parser.add_option('--no_bootstrap', '--no-bootstrap',
+                    action='store_true',
                     help='Don\'t bootstrap from Google Storage')
-  parser.add_option('--ignore_locks', action='store_true',
+  parser.add_option('--ignore_locks', '--ignore-locks',
+                    action='store_true',
                     help='Don\'t try to lock repository')
 
   options, args = parser.parse_args(args)
   if not len(args) == 1:
     parser.error('git cache populate only takes exactly one repo url.')
   url = args[0]
 
   mirror = Mirror(url, refs=options.ref)
   kwargs = {
       'verbose': options.verbose,
@@ skipping 73 matching lines @@
     return options, args
 
 
 def main(argv):
   dispatcher = subcommand.CommandDispatcher(__name__)
   return dispatcher.execute(OptionParser(), argv)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv[1:]))