t: factor out FUNNYNAMES as shared lazy prereq

diff --git a/git-submodule.sh b/git-submodule.sh
index 1fddc098f505ccc353e8514f24b824bf1b5065aa..78073cd87d1b1775bb4f4264557aba18c73c5911 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -236,6 +236,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
@@ -625,7 +630,7 @@ cmd_update()
                                # is not reachable from a ref.
                                is_tip_reachable "$sm_path" "$sha1" ||
                                fetch_in_submodule "$sm_path" $depth ||
-                               die "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
+                               say "$(eval_gettext "Unable to fetch in submodule path '\$displaypath'")"
 
                                # Now we tried the usual fetch, but $sha1 may
                                # not be reachable from any of the refs