diff options
| author | Simo Fält <simo.falt@digia.com> | 2013-04-02 08:53:32 +0300 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-17 12:16:18 +0200 |
| commit | 288c26290d953d6cea1d7ee57f55a4a988e31098 (patch) | |
| tree | 7518b84a233dbe8d66b254e0e35764f57ac02a15 /scripts/qt | |
| parent | 0ed3a8ffe12f700081d9f16f938da9f17fee0556 (diff) | |
Getting prepared for relative submodule specs
.gitmodules file may have relative submodule paths instead of full
url.
Change-Id: Ib4f00cb2a75a00ffdb7465b669354e0bf7bab1f9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'scripts/qt')
| -rwxr-xr-x | scripts/qt/qt_update_submodules.pl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/qt/qt_update_submodules.pl b/scripts/qt/qt_update_submodules.pl index c72f4e13..6e9ed4cc 100755 --- a/scripts/qt/qt_update_submodules.pl +++ b/scripts/qt/qt_update_submodules.pl @@ -266,6 +266,12 @@ sub update_submodule confess "Command `@cmd' did not output a giturl"; } + # Let's be prepared for relative paths in .gitmodules + if ($giturl eq "../$submodule.git") { + $giturl = trim $self->exe( qw(git config --file), ".git/config", "remote.origin.url" ); + $giturl =~ s,[^/]+$,$submodule.git,; + } + chdir catfile($base_dir, $submodule); $self->exe( qw(git fetch --verbose), $giturl, "+$ref:refs/heads/updated_submodule" ); |