lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-05 02:39:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/5.4' into 5.5

Browse Source
This commit is contained in:
Oswald Buddenhagen
2015-03-09 12:28:37 +01:00
parent 4b962aee82 ac6168c0cb
commit a5edc40176
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
init-repository
View File

@@ -375,7 +375,7 @@ sub git_clone_all_submodules
} }
foreach my $module (@modules) { foreach my $module (@modules) {
$self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}); $self->git_clone_one_submodule($subdirs{$module}, $subbases{$module}, $subbranches{$module});
} }
if ($co_branch) { if ($co_branch) {
@@ -432,7 +432,7 @@ sub git_add_remotes
sub git_clone_one_submodule sub git_clone_one_submodule
{ {
my ($self, $submodule, $repo_basename) = @_; my ($self, $submodule, $repo_basename, $branch) = @_;
my $alternates = $self->{ 'alternates' }; my $alternates = $self->{ 'alternates' };
my $mirror_url = $self->{ 'mirror-url' }; my $mirror_url = $self->{ 'mirror-url' };
@@ -468,7 +468,8 @@ sub git_clone_one_submodule
my $do_clone = (! -e "$submodule/.git"); my $do_clone = (! -e "$submodule/.git");
if ($do_clone) { if ($do_clone) {
$self->exe('git', 'clone', '--no-checkout', @reference_args, push @reference_args, '--branch', $branch if ($branch);
$self->exe('git', 'clone', @reference_args,
($mirror ? $mirror : $url), $submodule); ($mirror ? $mirror : $url), $submodule);
} }