git: grok 'help' to mean '--help'.

[thirdparty/git.git] / git-ls-remote.sh

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index 604c5f5bbe5c8882f99552a87b32f7a78019d234..f69926862fba15c28933c6dd616065d331b9a89b 100755 (executable)
--- a/git-ls-remote.sh
+++ b/git-ls-remote.sh
@@ -1,12 +1,16 @@
 #!/bin/sh
 #
-. git-sh-setup || die "Not a git archive"
 
 usage () {
     echo >&2 "usage: $0 [--heads] [--tags] <repository> <refs>..."
     exit 1;
 }
 
+die () {
+    echo >&2 "$*"
+    exit 1
+}
+
 while case "$#" in 0) break;; esac
 do
   case "$1" in
@@ -42,12 +46,16 @@ 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 "$peek_repo/info/refs" ||
+               echo "failed    slurping"
        ;;
 
 rsync://* )
        mkdir $tmpdir
-       rsync -rq "$peek_repo/refs" $tmpdir || exit 1
+       rsync -rq "$peek_repo/refs" $tmpdir || {
+               echo "failed    slurping"
+               exit
+       }
        (cd $tmpdir && find refs -type f) |
        while read path
        do
@@ -58,12 +66,17 @@ rsync://* )
        ;;
 
 * )
-       git-peek-remote "$peek_repo"
+       git-peek-remote "$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 ;;