Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(567)

Unified Diff: git_cl.py

Issue 2072923002: Gerrit git cl upload: Remove --no-squash warning message. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: fixed tests Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tests/git_cl_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index 0aafa85e1f73cc097c945569a7671025dc5201b4..75be64e6780b0b963f3c0bfee8a5aa5200f2af9a 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -2338,18 +2338,6 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
"""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)
« no previous file with comments | « no previous file | tests/git_cl_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698