diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-12-07 17:06:14 +0530 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2020-12-07 09:02:44 -0500 |
| commit | 1c631ec8abd34df9971ab03faf22d709f1c54348 (patch) | |
| tree | 33477088bd32b637e3d13912fac2455c204ff1d7 | |
| parent | c21b04ba087189472c60ce6e84987b74e9b7fccd (diff) | |
| download | meson-1c631ec8abd34df9971ab03faf22d709f1c54348.zip meson-1c631ec8abd34df9971ab03faf22d709f1c54348.tar.gz meson-1c631ec8abd34df9971ab03faf22d709f1c54348.tar.bz2 | |
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.
| -rwxr-xr-x | mesonbuild/msubprojects.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index 4ab24d9..7c227f7 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: |