X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-ls-remote.sh;h=a6ed99a7c52ac557b01e4dbf271abdf5b9a18b4b;hb=66d5871ead74ae363274f221c9fa5945c18c4aa2;hp=0f88953f299c1fd1243c3d5d6ae1e71d56e842a8;hpb=f5961572a02ef08324f297fe93b704ff2137e5a6;p=git.git diff --git a/git-ls-remote.sh b/git-ls-remote.sh index 0f88953f2..a6ed99a7c 100755 --- 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" || @@ -85,8 +89,13 @@ rsync://* ) ;; * ) - 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 | @@ -94,7 +103,7 @@ while read sha1 path do case "$sha1" in failed) - die "Failed to find remote refs" + exit 1 ;; esac case "$path" in refs/heads/*)