From 1692f7d305682e7eaa812a2fd8d02dcbf39b6fae Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 27 Feb 2024 02:38:48 +0000 Subject: [PATCH] Bug 1882186 - Disambiguate that we are checking out a branch, not a file. r=firefox-build-system-reviewers,ahochheiden If for some reason the branch doesn't exist, git will complain about a file with that name not being found. (see e.g. bug 1880502 for an example of how that may happen) Differential Revision: https://phabricator.services.mozilla.com/D202762 --- python/mozboot/bin/bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/mozboot/bin/bootstrap.py b/python/mozboot/bin/bootstrap.py index 837a581b20e1..8a987863edd5 100755 --- a/python/mozboot/bin/bootstrap.py +++ b/python/mozboot/bin/bootstrap.py @@ -228,7 +228,7 @@ def git_clone_firefox(git: Path, dest: Path, watchman: Path, head_repo, head_rev ) subprocess.check_call( - [str(git), "checkout", "FETCH_HEAD" if head_rev else "bookmarks/central"], + [str(git), "checkout", "FETCH_HEAD" if head_rev else "bookmarks/central", "--"], cwd=str(dest), env=env, )