From d01d5ea3ae9d82cff000ee48638d486aeace40f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simo=20F=C3=A4lt?= <simo.falt@digia.com>
Date: Tue, 7 May 2013 11:52:11 +0300
Subject: [PATCH] Removing the relative submodule path patch
It doesn't do what it was supposed to do, while we don't have url
for the origin remote.
Change-Id: Ie903c28b8cea78ef33289ad6cbd6c84c20b7b249
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
---
scripts/qt/qt_update_submodules.pl | 6 ------
1 file changed, 6 deletions(-)
diff --git a/scripts/qt/qt_update_submodules.pl b/scripts/qt/qt_update_submodules.pl
index d47a75e4..c72f4e13 100755
--- a/scripts/qt/qt_update_submodules.pl
+++ b/scripts/qt/qt_update_submodules.pl
@@ -266,12 +266,6 @@ 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_qx( qw(git config --file), "$base_dir/.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" );
--
GitLab