summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@theqtcompany.com>2015-03-25 12:17:47 +0100
committerJani Heikkinen <jani.heikkinen@theqtcompany.com>2015-03-27 10:04:11 +0000
commitb34e3669ff5dff4ab791eeb699e5284ed4332dc1 (patch)
treeb5ab5759af67763e433de2a1f52b7ce1f15707a1
parent1b9d3e4ec084f4aa22ac7c5a27bc93efe13db675 (diff)
Prospective fix for unnecessary submodule cloning
When cloning qtdeclarative, we end up also cloning qtdeclarative-testsuites, which is not intentional for users of Qt (and init-repository). The init-repository script checks for the submodule "repo".update key and skips the sub module if the value is "ignore". However according to the documentation no checkout is to be done if the value is "none", which is also what qtdeclarative's .gitmodules specifies for the ecmascript test suite. Change-Id: Ieb37607ae4ea7c32d6af886d3e2533fb9dea1f13 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
-rwxr-xr-xinit-repository2
1 files changed, 1 insertions, 1 deletions
diff --git a/init-repository b/init-repository
index 46456e9d..e80c7dca 100755
--- a/init-repository
+++ b/init-repository
@@ -334,7 +334,7 @@ sub git_clone_all_submodules
while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {}
$subbases{$mod} = $base;
} elsif ($2 eq "update") {
- push @subset, '-'.$1 if ($3 eq 'ignore');
+ push @subset, '-'.$1 if ($3 eq 'none');
} elsif ($2 eq "initrepo") {
$subinits{$1} = ($3 eq "yes" or $3 eq "true");
}