contrib: Make remotes2config.sh script more robust

The remotes2config.sh script replaced all 'unsafe' characters in repo
name with '.'; include '-' in the 'safe' characters set (the set is
probably even larger).

Script required also space after "URL:", "Push:" and "Pull:" in
remotes file. This for example made the following remote
URL: git://git.kernel.org/pub/scm/git/git.git
Pull: refs/heads/master:refs/heads/origin
Pull:+refs/heads/pu:refs/heads/pu
miss 'pu' branch (forced branch) in config file after conversion.
Allow for any number of whitespace after "URL:", "Push:", "Pull:".

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remotes2config.sh b/contrib/remotes2config.sh
old mode 100644 (file)
new mode 100755 (executable)
index 5838b3a..1cda19f
--- a/contrib/remotes2config.sh
+++ b/contrib/remotes2config.sh
@@ -11,11 +11,11 @@ if [ -d "$GIT_DIR"/remotes ]; then
        {
                cd "$GIT_DIR"/remotes
                ls | while read f; do
-                       name=$(printf "$f" | tr -c "A-Za-z0-9" ".")
+                       name=$(printf "$f" | tr -c "A-Za-z0-9-" ".")
                        sed -n \
-                       -e "s/^URL: \(.*\)$/remote.$name.url \1 ./p" \
-                       -e "s/^Pull: \(.*\)$/remote.$name.fetch \1 ^$ /p" \
-                       -e "s/^Push: \(.*\)$/remote.$name.push \1 ^$ /p" \
+                       -e "s/^URL:[    ]*\(.*\)$/remote.$name.url \1 ./p" \
+                       -e "s/^Pull:[   ]*\(.*\)$/remote.$name.fetch \1 ^$ /p" \
+                       -e "s/^Push:[   ]*\(.*\)$/remote.$name.push \1 ^$ /p" \
                        < "$f"
                done
                echo done