diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-13 21:50:53 +0200 |
---|---|---|
committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-15 09:03:16 +0200 |
commit | ce45f45dfb8232b8ce599745ebd3bb7888fc4ea0 (patch) | |
tree | 011bbca05a702395e838c9b8b65b815ea9b4dbbe /init-repository | |
parent | 8801fd02585b1f026a20b45558080e4d924cf2a5 (diff) |
init-repository: Make sure that we update a submodule before we recurse
Unless we do so, doing git submodule init in a submodule would use the
currently checked out version of its .gitmodule instead of the one of
its pinned SHA1.
Change-Id: I88de421c8d24748dcaa5334c82da2aac4b12b2ad
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'init-repository')
-rwxr-xr-x | init-repository | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init-repository b/init-repository index 4757f4f0..86d05d42 100755 --- a/init-repository +++ b/init-repository @@ -475,6 +475,7 @@ sub git_clone_all_submodules if ($line =~ /submodule\.([^.=]+)\.url=(.*)/) { $self->git_clone_one_submodule($1, $2); if ($1 eq "qtwebengine") { + $self->exe('git', 'submodule', 'update', $1); chdir($1) or confess "chdir $1: $OS_ERROR"; $self->exe('git', 'submodule', 'init'); $self->git_clone_all_submodules; |