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

Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging

Browse Source 
* 'master' of git://scm.dev.nokia.troll.no/qt/qt5-staging:
  init-repository: avoid failure when combining `--force' and mirrors
This commit is contained in:
Qt Continuous Integration System
2011-05-06 17:27:05 +10:00
parent 7d94af3595 caba93a9a6
commit 5bdb8b1784
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
init-repository
View File

@@ -479,6 +479,13 @@ sub git_clone_one_submodule
if ($mirror) {
$self->exe('git', 'config', 'remote.origin.url', $url);
# In `force' mode, remove the mirror if it already exists,
# since we may be reinitializing the module.
if ($self->{force}) {
eval { $self->exe('git', 'remote', 'rm', 'mirror'); }; # failure is OK
}
$self->exe('git', 'remote', 'add', 'mirror', $mirror);
}