diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-09 10:33:56 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-14 07:24:32 +0000 |
commit | d615b4a99f2dcbdf464323b4c63f4f71b08b8c47 (patch) | |
tree | 0d809a18ab4cc1295ec473d3819b56d5ff0900df /init-repository | |
parent | bded0e1bbc43c1243b2d924f54862b5b7eb748ec (diff) | |
parent | bbf18ab4ad3d965f1512f64e7d3c49eeb5f3f8b3 (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Remove QNX Windows builds, 0358b6d2
Remove Integrity build temporarily, QTBUG-61702
coin/provisioning/qtci-macos-10.12-x86_64/020-xcode.sh
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I5a56633d6cd60b5514828060fde87f784e54cdda
Diffstat (limited to 'init-repository')
-rwxr-xr-x | init-repository | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init-repository b/init-repository index 861511b9..11a75ffd 100755 --- a/init-repository +++ b/init-repository @@ -469,7 +469,7 @@ sub git_stat_one_submodule my $orig_cwd = getcwd(); chdir($submodule) or confess "chdir $submodule: $OS_ERROR"; - my @sts = qx(git status --porcelain --untracked=no); + my @sts = qx(git status --porcelain --untracked=no --ignore-submodules=all); # After a git clone --no-checkout, git status reports all files as # staged for deletion, but we still want to update the submodule. |