[patch] Patch to canonize relative URLs of submodules to not contain ../ or ./ - version 2

git-r3.eclass.patch (text/plain), 1.37 KB, created by Jan Huwald on 2014-02-13 22:05:55 UTC

diff --git a/git-r3.eclass.bak_by_hu b/git-r3.eclass
index 0341972..e9a4003 100644
--- a/git-r3.eclass.bak_by_hu
+++ b/git-r3.eclass
@@ -368,6 +368,23 @@ _git-r3_is_local_repo() {
 	[[ ${uri} == file://* || ${uri} == /* ]]
 }
 
+# @FUNCTION: _git-r3_canonize_url
+# @USAGE: <uri>
+# @INTERNAL
+# @DESCRIPTION:
+# Removes ../ and ./ from paths so that the location pointed at
+# remains the same.
+_git-r3_canonize_url() {
+	new="$1"
+	shopt -s extglob
+	while [[ "$old" != "$new" ]]; do
+		old="$new"
+		new="${old/+([^\/])\/..\//}" # collapse dir/../ to /
+		new="${new/\/.\///}"         # collapse /./ to /
+	done
+	echo "$new"
+}
+
 # @FUNCTION: git-r3_fetch
 # @USAGE: [<repo-uri> [<remote-ref> [<local-id>]]]
 # @DESCRIPTION:
@@ -534,7 +551,10 @@ git-r3_fetch() {
 				die "Unable to get commit id for submodule ${subname}"
 			fi
 			if [[ ${url} == ./* || ${url} == ../* ]]; then
-				local subrepos=( "${repos[@]/%//${url}}" )
+				local subrepos=( )
+				for i in "${repos[@]/%/\/${url}}"; do
+					subrepos=("${subrepos[@]}" $(_git-r3_canonize_url "$i"))
+				done
 			else
 				local subrepos=( "${url}" )
 			fi
@@ -655,7 +675,7 @@ git-r3_checkout() {
 			local path=${submodules[2]}
 
 			if [[ ${url} == ./* || ${url} == ../* ]]; then
-				url=${repos[0]%%/}/${url}
+				url="$(_git-r3_canonize_url "${repos[0]%%/}/${url}")"
 			fi
 
 			git-r3_checkout "${url}" "${GIT_WORK_TREE}/${path}" \