From db9a0b01c2ea01f925c9c46039bd07c4b35e26fe Mon Sep 17 00:00:00 2001 From: Anne Redulla Date: Tue, 21 Jan 2025 15:40:48 -0800 Subject: [PATCH] [win-bootstrap] Exit with error if no Git in PATH Bug: b/360206460 Change-Id: I5da52de0e050f4e6b9e484052d1e9ddacb79e8ad Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6171044 Reviewed-by: Josip Sokcevic Reviewed-by: Allen Li Commit-Queue: Anne Redulla --- bootstrap/bootstrap.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrap/bootstrap.py b/bootstrap/bootstrap.py index 176e6b7bcd..8d9592938e 100644 --- a/bootstrap/bootstrap.py +++ b/bootstrap/bootstrap.py @@ -485,12 +485,13 @@ def main(argv): clean_up_old_installations(bootstrap_dir) if IS_WIN: + # Search for a Git installation. git_dir = search_win_git_directory() if not git_dir: - # Either using system git was not enabled - # or git was not found in PATH. - # Fall back to depot_tools bundled git. - git_dir = os.path.join(bootstrap_dir, 'git') + logging.error('Failed to bootstrap depot_tools.\n' + 'Git was not found in PATH. Have you installed it?') + return 1 + template = template._replace(GIT_BIN_ABSDIR=git_dir) git_postprocess(template) templates = [