Gerrit git cl: temporary disable cc option on upload.

tests/git_cl_test.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.
 
 """Unit tests for git_cl.py."""
 
 import os
 import StringIO
 import stat
@@ skipping 791 matching lines @@
           ]
     else:
       ref_to_push = 'HEAD'
 
     calls += [
         ((['git', 'rev-list',
             expected_upstream_ref + '..' + ref_to_push],), ''),
         ((['git', 'config', 'rietveld.cc'],), '')
         ]
     # Add cc from watch list.
-    if ref_suffix == '':
-      ref_suffix = '%cc=joe@example.com'
-    else:
-      ref_suffix += ',cc=joe@example.com'
+    # TODO(tandrii): bring this back after http://crbug.com/604377.
+    # if ref_suffix == '':
+    #   ref_suffix = '%cc=joe@example.com'
+    # else:
+    #   ref_suffix += ',cc=joe@example.com'
     if reviewers:
-      ref_suffix += ',' + ','.join('r=%s' % email
-                                   for email in sorted(reviewers))
+      if ref_suffix:
+        ref_suffix += ','
+      else:
+        ref_suffix = '%'
+      ref_suffix += ','.join('r=%s' % email for email in sorted(reviewers))
     calls += [
         ((['git', 'push', 'origin',
            ref_to_push + ':refs/for/refs/heads/master' + ref_suffix],),
          ('remote:\n'
          'remote: Processing changes: (\)\n'
          'remote: Processing changes: (|)\n'
          'remote: Processing changes: (/)\n'
          'remote: Processing changes: (-)\n'
          'remote: Processing changes: new: 1 (/)\n'
          'remote: Processing changes: new: 1, done\n'
@@ skipping 546 matching lines @@
     # TODO(tandrii): consider testing just set-commit and set-commit --clear,
     # but without copy-pasting tons of expectations, as modifying them later is
     # super tedious.
     self.assertEqual(0, git_cl.main(['set-commit', '-d']))
 
 
 if __name__ == '__main__':
   git_cl.logging.basicConfig(
       level=git_cl.logging.DEBUG if '-v' in sys.argv else git_cl.logging.ERROR)
   unittest.main()