Don't call settings.GetIsGerrit() before parser.parse_args()

git_cl.py

Index: git_cl.py
===================================================================
--- git_cl.py	(revision 169567)
+++ git_cl.py	(working copy)
@@ -1246,12 +1246,16 @@
                     help="Emulate Subversion's auto properties feature.")
   parser.add_option('-c', '--use-commit-queue', action='store_true',
                     help='tell the commit queue to commit this patchset')
-  if settings.GetIsGerrit():
-    parser.add_option('--target_branch', dest='target_branch', default='master',
-                      help='target branch to upload')
+  parser.add_option('--target_branch',
+                    help='When uploading to gerrit, remote branch to ' +

[M-A Ruel, 2012/11/27 14:20:52]

Also no need for + and align the second line at the "=".

[ukai, 2012/11/28 02:25:19]

Done.

+                    'use for CL.  Default: master')
   add_git_similarity(parser)
   (options, args) = parser.parse_args(args)
 
+  if options.target_branch and not settings.GetIsGerrit():
+    print >> sys.stderr, (

[M-A Ruel, 2012/11/27 14:20:52]

Use parser.error() instead

[ukai, 2012/11/28 02:25:19]

Done.

+        '\nWARNING: Use --target_branch for non gerrit repository.\n')
+
   # Print warning if the user used the -m/--message argument.  This will soon
   # change to -t/--title.
   if options.message: