ls-remote and clone: accept --upload-pack=<path> as well.

This makes them consistent with other commands that take the
path to the upload-pack program.  We also pass --upload-pack
instead of --exec to the underlying fetch-pack, although it is
not strictly necessary.

[jc: original motivation from Uwe]

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-clone.sh b/git-clone.sh
index 0f7bbbfb39cb4eb08379b8441b1ceab3d55d18e5..ced7dfba3e205214e9e88d25d58017649e7ffe07 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -163,7 +163,9 @@ while
        1,-u|1,--upload-pack) usage ;;
        *,-u|*,--upload-pack)
                shift
        1,-u|1,--upload-pack) usage ;;
        *,-u|*,--upload-pack)
                shift

-               upload_pack="--exec=$1" ;;
+               upload_pack="--upload-pack=$1" ;;
+       *,--upload-pack=*)
+               upload_pack=--upload-pack=$(expr "$1" : '-[^=]*=\(.*\)') ;;

        1,--depth) usage;;
        *,--depth)
                shift
        1,--depth) usage;;
        *,--depth)
                shift

diff --git a/git-fetch.sh b/git-fetch.sh
index 87b940b85b5b128f29dc6084bb545640e5bf6b92..07a1d05ac7a30b08355f330f5300492ac5afb790 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -22,7 +22,6 @@ force=
 verbose=
 update_head_ok=
 exec=
 verbose=
 update_head_ok=
 exec=

-upload_pack=

 keep=
 shallow_depth=
 while case "$#" in 0) break ;; esac
 keep=
 shallow_depth=
 while case "$#" in 0) break ;; esac


@@ -34,8 +33,12 @@ do
        --upl|--uplo|--uploa|--upload|--upload-|--upload-p|\
        --upload-pa|--upload-pac|--upload-pack)
                shift
        --upl|--uplo|--uploa|--upload|--upload-|--upload-p|\
        --upload-pa|--upload-pac|--upload-pack)
                shift

-               exec="--exec=$1" 
-               upload_pack="-u $1"
+               exec="--upload-pack=$1"
+               ;;
+       --upl=*|--uplo=*|--uploa=*|--upload=*|\
+       --upload-=*|--upload-p=*|--upload-pa=*|--upload-pac=*|--upload-pack=*)
+               exec=--upload-pack=$(expr "$1" : '-[^=]*=\(.*\)')
+               shift

                ;;
        -f|--f|--fo|--for|--forc|--force)
                force=t
                ;;
        -f|--f|--fo|--for|--forc|--force)
                force=t


@@ -94,7 +97,7 @@ then
 fi
 
 # Global that is reused later
 fi
 
 # Global that is reused later

-ls_remote_result=$(git ls-remote $upload_pack "$remote") ||
+ls_remote_result=$(git ls-remote $exec "$remote") ||

        die "Cannot get the repository state from $remote"
 
 append_fetch_head () {
        die "Cannot get the repository state from $remote"
 
 append_fetch_head () {

diff --git a/git-ls-remote.sh b/git-ls-remote.sh
index 03b624ef33dd3690a3cf24b4eaab830e5875789b..dd22783824ab8d01bba9e589aa0f60d59c859272 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
   -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 "$1" : '-[^=]*=\(.*\)')

        shift;;
   --)
   shift; break ;;
        shift;;
   --)
   shift; break ;;