Merge branch 'jl/submodule-add-relurl-wo-upstream' into maint

* jl/submodule-add-relurl-wo-upstream:
  submodule add: clean up duplicated code
  submodule add: allow relative repository path even when no url is set
  submodule add: test failure when url is not configured in superproject

Conflicts:
	git-submodule.sh

diff --cc Documentation/git-submodule.txt
Simple merge

diff --cc git-submodule.sh
index 20c9bec9709749239849e5e91df2a9ac40c77eae,32cb05443a851e7bd77d86b3bb3b2f7962c4d53b..f8ea3bf6f2bc4310fd0cfcf212f89c1e06ee8f33
--- 1/git-submodule.sh
--- 2/git-submodule.sh
+++ b/git-submodule.sh
@@@ -238,14 -238,7 +238,6 @@@ cmd_add(
                        die "'$path' already exists and is not a valid git repo"
                fi
  
-               case "$repo" in
-               ./*|../*)
-                       url=$(resolve_relative_url "$repo") || exit
-                   ;;
-               *)
-                       url="$repo"
-                       ;;
-               esac
 -              git config submodule."$path".url "$realrepo"
        else
  
                module_clone "$path" "$realrepo" "$reference" || exit
@@@ -259,7 -252,6 +251,7 @@@
                        esac
                ) || die "Unable to checkout submodule '$path'"
        fi
-       git config submodule."$path".url "$url"
++      git config submodule."$path".url "$realrepo"
  
        git add $force "$path" ||
        die "Failed to add submodule '$path'"

diff --cc t/t7400-submodule-basic.sh
Simple merge