Merge branch 'bp/merge-rename-config'

diff --git a/git-submodule.sh b/git-submodule.sh
index 24914963ca23c837e0cc46ca2dc0fa46bf9886a6..7e27d0a0da4d130f9ccb92612848da8e219427a0 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -229,6 +229,11 @@ Use -f if you really want to add it." >&2
                sm_name="$sm_path"
        fi
 
+       if ! git submodule--helper check-name "$sm_name"
+       then
+               die "$(eval_gettext "'$sm_name' is not a valid submodule name")"
+       fi
+
        # perhaps the path exists and is already a git repo, else clone it
        if test -e "$sm_path"
        then