X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-ls-remote.sh;h=8ea5c5e816c067db88f04bc5a0613ca1dbb13456;hb=c4431d380c20b4c05c373980c600798fc02e79b0;hp=2fdcaf7886850b1f59a1775bffc23948d1b62c6a;hpb=31262627109476c529418132e0820687003fb1fe;p=git.git

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index 2fdcaf788..8ea5c5e81 100755
--- a/git-ls-remote.sh
+++ b/git-ls-remote.sh
@@ -23,7 +23,11 @@ do
   -u|--u|--up|--upl|--uploa|--upload|--upload-|--upload-p|--upload-pa|\
   --upload-pac|--upload-pack)
 	shift
-	exec="--exec=$1"
+	exec="--upload-pack=$1"
+	shift;;
+  -u=*|--u=*|--up=*|--upl=*|--uplo=*|--uploa=*|--upload=*|\
+  --upload-=*|--upload-p=*|--upload-pa=*|--upload-pac=*|--upload-pack=*)
+	exec=--upload-pack=$(expr "z$1" : 'z-[^=]*=\(.*\)')
 	shift;;
   --)
   shift; break ;;
@@ -49,10 +53,14 @@ trap "rm -fr $tmp-*" 0 1 2 3 15
 tmpdir=$tmp-d
 
 case "$peek_repo" in
-http://* | https://* )
+http://* | https://* | ftp://* )
         if [ -n "$GIT_SSL_NO_VERIFY" ]; then
             curl_extra_args="-k"
         fi
+	if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
+		"`git-config --bool http.noEPSV`" = true ]; then
+		curl_extra_args="${curl_extra_args} --disable-epsv"
+	fi
 	curl -nsf $curl_extra_args --header "Pragma: no-cache" "$peek_repo/info/refs" ||
 		echo "failed	slurping"
 	;;
@@ -90,7 +98,7 @@ while read sha1 path
 do
 	case "$sha1" in
 	failed)
-		die "Failed to find remote refs"
+		exit 1 ;;
 	esac
 	case "$path" in
 	refs/heads/*)