Allow fetch-pack to decide keeping the fetched pack without exploding

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index f0f0b07f6f8c85219104303d65dabbba80fd3098..dd22783824ab8d01bba9e589aa0f60d59c859272 100755 (executable)
--- a/git-ls-remote.sh
+++ b/git-ls-remote.sh
@@ -1,12 +1,18 @@
 #!/bin/sh
 #
-. git-sh-setup
 
 usage () {
-    echo >&2 "usage: $0 [--heads] [--tags] <repository> <refs>..."
+    echo >&2 "usage: $0 [--heads] [--tags] [-u|--upload-pack <upload-pack>]"
+    echo >&2 "          <repository> <refs>..."
     exit 1;
 }
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
+exec=
 while case "$#" in 0) break;; esac
 do
   case "$1" in
@@ -14,6 +20,15 @@ do
   heads=heads; shift ;;
   -t|--t|--ta|--tag|--tags)
   tags=tags; shift ;;
+  -u|--u|--up|--upl|--uploa|--upload|--upload-|--upload-p|--upload-pa|\
+  --upload-pac|--upload-pack)
+       shift
+       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 "$1" : '-[^=]*=\(.*\)')
+       shift;;
   --)
   shift; break ;;
   -*)
@@ -38,20 +53,32 @@ 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
-       curl -nsf $curl_extra_args "$peek_repo/info/refs" ||
+       if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
+               "`git-repo-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"
        ;;
 
 rsync://* )
-       mkdir $tmpdir
+       mkdir $tmpdir &&
+       rsync -rlq "$peek_repo/HEAD" $tmpdir &&
        rsync -rq "$peek_repo/refs" $tmpdir || {
                echo "failed    slurping"
                exit
        }
+       head=$(cat "$tmpdir/HEAD") &&
+       case "$head" in
+       ref:' '*)
+               head=$(expr "z$head" : 'zref: \(.*\)') &&
+               head=$(cat "$tmpdir/$head") || exit
+       esac &&
+       echo "$head     HEAD"
        (cd $tmpdir && find refs -type f) |
        while read path
        do
@@ -62,7 +89,7 @@ rsync://* )
        ;;
 
 * )
-       git-peek-remote "$peek_repo" ||
+       git-peek-remote $exec "$peek_repo" ||
                echo "failed    slurping"
        ;;
 esac |
@@ -71,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/*)