Merge branch 'jc/apply-include-exclude'

[git.git] / git-submodule.sh

diff --git a/git-submodule.sh b/git-submodule.sh
index 1c39b593a628cc94d24d227cc5d92e00ac5e71ed..92be0feb5840c055061f680a45eef6c8f4ebda2d 100755 (executable)
--- 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
                (