From 675c4e57ea9f8e1bd147eac242d94d78ca832f02 Mon Sep 17 00:00:00 2001 From: Anne Redulla Date: Tue, 10 Dec 2024 07:12:19 +0000 Subject: [PATCH] [win-bootstrap] Update warning to specify agreement is to automatic updates Bug: b/382395049 Change-Id: I6e9aa9521f1f101590b292eb1f8d381cf3c88de8 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6072988 Reviewed-by: Josip Sokcevic Commit-Queue: Anne Redulla Reviewed-by: Allen Li --- bootstrap/bootstrap.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index 0272905ec..68441956d 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -414,15 +414,18 @@ def _win_git_bootstrap_config(): return if allow_global not in ('true', '1', 'yes', 'on'): - logging.warning( - 'depot_tools would like to update your global Git config\n' - 'to have the optimal settings for Chromium development.\n' - 'Allow this by running:\n' - f' git config --global {allow_global_key} true\n' - 'Then, get depot_tools to update your config by running:\n' - ' gclient sync\n' - 'To deny and silence this warning, run:\n' - f' git config --global {allow_global_key} false\n') + lines = [ + 'depot_tools would like to update your global Git config', + 'to have the optimal settings for Chromium development.', + 'You can allow depot_tools to automatically update your global', + 'Git config to recommended settings by running:', + f'$ git config --global {allow_global_key} true', + '', + 'To suppress this warning:', + f'$ git config --global {allow_global_key} false', + ] + + logging.warning('\n'.join(lines)) return # Global git config changes have been authorized - do the update.