diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2023-05-31 10:16:31 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-12 23:50:42 +0000 |
| commit | 9a31ac47926381a994603ff09ce855b151b7bd4e (patch) | |
| tree | 5c7d0a8869876f9d7b071cf4c12aaa6cc9148423 | |
| parent | 3421cc61c1d9d93c55211fff201dfa1bb06f7030 (diff) | |
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 6c40b6160e08887e86d4052703c513a11e0a6015)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | init-repository | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init-repository b/init-repository index fe115e2d..82e02cf9 100755 --- a/init-repository +++ b/init-repository @@ -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; |