X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-ls-remote.sh;h=2fdcaf7886850b1f59a1775bffc23948d1b62c6a;hb=b642d9ef643371990c0a921836f2a074d48ce1b3;hp=604c5f5bbe5c8882f99552a87b32f7a78019d234;hpb=215a7ad1ef790467a4cd3f0dcffbd6e5f04c38f7;p=git.git

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index 604c5f5b..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,12 +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" || exit 1
+	curl -nsf $curl_extra_args --header "Pragma: no-cache" "$peek_repo/info/refs" ||
+		echo "failed	slurping"
 	;;
 
 rsync://* )
-	mkdir $tmpdir
-	rsync -rq "$peek_repo/refs" $tmpdir || exit 1
+	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
@@ -58,12 +81,17 @@ rsync://* )
 	;;
 
 * )
-	git-peek-remote "$peek_repo"
+	git-peek-remote $exec "$peek_repo" ||
+		echo "failed	slurping"
 	;;
 esac |
 sort -t '	' -k 2 |
 while read sha1 path
 do
+	case "$sha1" in
+	failed)
+		die "Failed to find remote refs"
+	esac
 	case "$path" in
 	refs/heads/*)
 		group=heads ;;