X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=contrib%2Fremotes2config.sh;h=1cda19f66af96fa828de81cbb21817abca0c06ea;hb=8c4021abfd170278d1a3431e2777bedd0c01fbb1;hp=0c8b9544908ad90c1731cbac14f9f78910abc8f8;hpb=7c851733e4bc2b36bd9df63cab2fe11180242670;p=git.git

diff --git a/contrib/remotes2config.sh b/contrib/remotes2config.sh
old mode 100644
new mode 100755
index 0c8b95449..1cda19f66
--- 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
@@ -26,8 +26,8 @@ if [ -d "$GIT_DIR"/remotes ]; then
 				mv "$GIT_DIR"/remotes "$GIT_DIR"/remotes.old
 			fi ;;
 		*)
-			echo "git-config $key "$value" $regex"
-			git-config $key "$value" $regex || error=1 ;;
+			echo "git config $key "$value" $regex"
+			git config $key "$value" $regex || error=1 ;;
 		esac
 	done
 fi