From 1c631ec8abd34df9971ab03faf22d709f1c54348 Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Mon, 7 Dec 2020 17:06:14 +0530 Subject: [PATCH] msubprojects: Ignore worktrees when checking out Otherwise it's not possible to share git subprojects via worktrees when creating a worktree of a git repository that uses meson subprojects. The downside is that the user needs to be careful while adding commits to each tree's index. --- mesonbuild/msubprojects.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index 4ab24d9b8..7c227f71a 100755 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -85,7 +85,7 @@ def git_reset(repo_dir, revision): return True def git_checkout(repo_dir, revision, create=False): - cmd = ['checkout', revision, '--'] + cmd = ['checkout', '--ignore-other-worktrees', revision, '--'] if create: cmd.insert('-b', 1) try: