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.
pull/8076/head
Nirbheek Chauhan 4 years ago committed by Xavier Claessens
parent c21b04ba08
commit 1c631ec8ab
  1. 2
      mesonbuild/msubprojects.py

@ -85,7 +85,7 @@ def git_reset(repo_dir, revision):
return True return True
def git_checkout(repo_dir, revision, create=False): def git_checkout(repo_dir, revision, create=False):
cmd = ['checkout', revision, '--'] cmd = ['checkout', '--ignore-other-worktrees', revision, '--']
if create: if create:
cmd.insert('-b', 1) cmd.insert('-b', 1)
try: try:

Loading…
Cancel
Save