Fix new-workdir (again) to work on bare repositories

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

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index 03b624ef33dd3690a3cf24b4eaab830e5875789b..b7e5d0458470248e65da0893b8b9bb4ced9152da 100755 (executable)
--- 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 ;;
@@ -54,7 +58,7 @@ http://* | https://* | ftp://* )
             curl_extra_args="-k"
         fi
        if [ -n "$GIT_CURL_FTP_NO_EPSV" -o \
-               "`git-repo-config --bool http.noEPSV`" = true ]; then
+               "`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" ||
@@ -78,15 +82,20 @@ rsync://* )
        (cd $tmpdir && find refs -type f) |
        while read path
        do
-               cat "$tmpdir/$path" | tr -d '\012'
+               tr -d '\012' <"$tmpdir/$path"
                echo "  $path"
        done &&
        rm -fr $tmpdir
        ;;
 
 * )
-       git-peek-remote $exec "$peek_repo" ||
+       if test -f "$peek_repo" ; then
+               git bundle list-heads "$peek_repo" ||
+               echo "failed    slurping"
+       else
+               git-peek-remote $exec "$peek_repo" ||
                echo "failed    slurping"
+       fi
        ;;
 esac |
 sort -t '      ' -k 2 |