diff options
| author | Andrei Alexeyev <0x416b617269@gmail.com> | 2019-03-02 15:59:31 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-11 20:31:52 +0200 |
| commit | faf3581df6af59c04e66378da129bb2039beab8a (patch) | |
| tree | f6e706065e70a518272684ed0b101d0b7c8aa21d /mesonbuild/msubprojects.py | |
| parent | 969e291835fec26b49ae56a7b79fdeb72a903d85 (diff) | |
| download | meson-faf3581df6af59c04e66378da129bb2039beab8a.zip meson-faf3581df6af59c04e66378da129bb2039beab8a.tar.gz meson-faf3581df6af59c04e66378da129bb2039beab8a.tar.bz2 | |
Fix git wraps with submodules
* If clone-recursive is specified, populate submodules only after
the specified revision/branch has been checked out. Fixes #4996
* Update submodules recursively on `meson subprojects update`
Diffstat (limited to 'mesonbuild/msubprojects.py')
| -rw-r--r-- | mesonbuild/msubprojects.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py index 1536d96..2c1bf8b 100644 --- a/mesonbuild/msubprojects.py +++ b/mesonbuild/msubprojects.py @@ -92,7 +92,7 @@ def update_git(wrap, repo_dir, options): ' To rebase your branch on top of', mlog.bold(revision), 'use', mlog.bold('--rebase'), 'option.') return - git(['submodule', 'update'], repo_dir) + git(['submodule', 'update', '--checkout', '--recursive'], repo_dir) git_show(repo_dir) def update_hg(wrap, repo_dir, options): |