From: Johan Herland <johan@herland.net>
Date: Mon, 22 Sep 2008 16:08:31 +0000 (+0200)
Subject: Fix submodule sync with relative submodule URLs
X-Git-Tag: v1.6.1-rc1~213
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=baede9f803ff7becab815481b004bc983d0422c7;p=git.git

Fix submodule sync with relative submodule URLs

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---

diff --git a/git-submodule.sh b/git-submodule.sh
index 1c39b593a..92be0feb5 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -634,6 +634,14 @@ cmd_sync()
 	do
 		name=$(module_name "$path")
 		url=$(git config -f .gitmodules --get submodule."$name".url)
+
+		# Possibly a url relative to parent
+		case "$url" in
+		./*|../*)
+			url=$(resolve_relative_url "$url") || exit
+			;;
+		esac
+
 		if test -e "$path"/.git
 		then
 		(