summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2014-12-12 14:00:24 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-02-06 06:23:54 +0000
commitb236ef6aefae55165044567448073f1618b52806 (patch)
tree665047dfc20562b887c5077cb8b9797604580609
parent0163cb617aa19a26423a716bef23bfc6308aadc6 (diff)
fix --branch without --no-update
clearly, i botched the syntax, but i can't even tell how. that's perl. the new version is more readable anyway. Change-Id: Ic3e93c2cf30ee92f368808070899af4b9f7809a3 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
-rwxr-xr-xinit-repository4
1 files changed, 3 insertions, 1 deletions
diff --git a/init-repository b/init-repository
index 9844f38c..6a7bd38e 100755
--- a/init-repository
+++ b/init-repository
@@ -387,7 +387,9 @@ sub git_clone_all_submodules
}
if ($self->{update}) {
- $self->exe('git', 'submodule', 'update', ($co_branch ? ('--remote', '--rebase') : ()));
+ my @cmd = ('git', 'submodule', 'update');
+ push @cmd, '--remote', '--rebase' if ($co_branch);
+ $self->exe(@cmd);
foreach my $module (@modules) {
if (-f $module.'/.gitmodules') {