X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-parse-remote.sh;h=187f0883c9136772677088ddf61228291d4b41d1;hb=86f363791b281fb916414a89282b2e67cdaa36c0;hp=8ce57c80fbcfae101d22fa3a6f2ebffa2ec01cc3;hpb=5a223a0d434c874984a0251eca4520ef95718a6d;p=git.git

diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 8ce57c80..187f0883 100755
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -4,33 +4,6 @@
 # this would fail in that case and would issue an error message.
 GIT_DIR=$(git-rev-parse --git-dir 2>/dev/null) || :;
 
-if [ -d "$GIT_DIR"/remotes -a "$GIT_REWRITE_REMOTES" = true ]; then
-	echo "Rewriting $GIT_DIR/remotes" >&2
-	error=0
-	# rewrite into config
-	{
-		cd "$GIT_DIR"/remotes
-		ls | while read f; do
-			name=$(echo -n "$f" | tr -c "A-Za-z0-9" ".")
-			sed -n \
-			-e "s/^URL: /remote.$name.url . /p" \
-			-e "s/^Pull: /remote.$name.pull ^$ /p" \
-			-e "s/^Push: /remote.$name.push ^$ /p" \
-			< "$f"
-		done
-		echo done
-	} | while read key regex value; do
-		case $key in
-		done)
-			if [ $error = 0 ]; then
-				mv "$GIT_DIR"/remotes "$GIT_DIR"/remotes.old
-			fi ;;
-		*)
-			git-repo-config $key "$value" $regex || error=1 ;;
-		esac
-	done
-fi
-
 get_data_source () {
 	case "$1" in
 	*/*)
@@ -69,8 +42,8 @@ get_remote_url () {
 	'')
 		echo "$1" ;;
 	config-partial)
-		token=$(expr "z$1" : '\([^/]*\)/')
-		remainder=$(expr "z$1" : '[^/]*/\(.*\)')
+		token=$(expr "z$1" : 'z\([^/]*\)/')
+		remainder=$(expr "z$1" : 'z[^/]*/\(.*\)')
 		url=$(git-repo-config --get "remote.$token.url")
 		echo "$url/$remainder"
 		;;
@@ -159,7 +132,7 @@ get_remote_default_refs_for_fetch () {
 		echo "HEAD:" ;;
 	config)
 		canon_refs_list_for_fetch \
-			$(git-repo-config --get-all "remote.$1.pull") ;;
+			$(git-repo-config --get-all "remote.$1.fetch") ;;
 	branches)
 		remote_branch=$(sed -ne '/#/s/.*#//p' "$GIT_DIR/branches/$1")
 		case "$remote_branch" in '') remote_branch=master ;; esac