mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 11:26:04 +08:00
init-repository: Fix wrong remote URLs in cloned submodules
The cloned submodules had a wrong origin remote URL if the origin remote
of the local qt5.git repository had a trailing slash.
Fix this by stripping the trailing slash when stripping the trailing
".git" from qt5.git's remote.
Fixes: QTBUG-113793
Change-Id: I199b6e1915f67558ecfe69f7300d0f9ef0d4b232
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 6c40b6160e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
committed by
Qt Cherry-pick Bot
parent
3421cc61c1
commit
9a31ac4792
@@ -666,7 +666,7 @@ sub run
|
||||
|
||||
chomp(my $url = `git config remote.origin.url`);
|
||||
die("Have no origin remote.\n") if (!$url);
|
||||
$url =~ s,\.git$,,;
|
||||
$url =~ s,\.git/?$,,;
|
||||
$url =~ s/((?:tqtc-)?qt5)$//;
|
||||
my $qtrepo = $1 || 'qt5';
|
||||
$self->{'base-url'} = $url;
|
||||
|
||||
Reference in New Issue
Block a user