X-Git-Url: https://git.octo.it/?p=git.git;a=blobdiff_plain;f=git-ls-remote.sh;h=2fdcaf7886850b1f59a1775bffc23948d1b62c6a;hp=bfbd5a4d5a1bb35f9f52e3a495d1830b76078a7c;hb=162f41292167a800432fc6bbacfcd9f93a90b0c8;hpb=a5cd85e084458bf573d0d29fa79c4e1ad7973ed7

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index bfbd5a4d..2fdcaf78 100755
--- a/git-ls-remote.sh
+++ b/git-ls-remote.sh
@@ -1,12 +1,18 @@
 #!/bin/sh
 #
-. git-sh-setup || die "Not a git archive"
 
 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,11 @@ 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="--exec=$1"
+	shift;;
   --)
   shift; break ;;
   -*)
@@ -42,16 +53,24 @@ http://* | https://* )
         if [ -n "$GIT_SSL_NO_VERIFY" ]; then
             curl_extra_args="-k"
         fi
-	curl -nsf $curl_extra_args "$peek_repo/info/refs" ||
+	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 +81,7 @@ rsync://* )
 	;;
 
 * )
-	git-peek-remote "$peek_repo" ||
+	git-peek-remote $exec "$peek_repo" ||
 		echo "failed	slurping"
 	;;
 esac |