Merge branch 'jc/mv'

diff --git a/git-fetch.sh b/git-fetch.sh
index d1659e2cfe78fef5bd8712edcedbf7296eb316be..b4325d9d98589bf7823174318b431197d6b896c6 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -18,16 +18,18 @@ force=
 verbose=
 update_head_ok=
 exec=
+upload_pack=
 while case "$#" in 0) break ;; esac
 do
        case "$1" in
        -a|--a|--ap|--app|--appe|--appen|--append)
                append=t
                ;;
-       -u|--u|--up|--upl|--uploa|--upload|--upload-|--upload-p|--upload-pa|\
-       --upload-pac|--upload-pack)
+       --upl|--uplo|--uploa|--upload|--upload-|--upload-p|\
+       --upload-pa|--upload-pac|--upload-pack)
                shift
                exec="--exec=$1" 
+               upload_pack="-u $1"
                ;;
        -f|--f|--fo|--for|--forc|--force)
                force=t
@@ -202,7 +204,7 @@ reflist=$(get_remote_refs_for_fetch "$@")
 if test "$tags"
 then
        taglist=$(IFS=" " &&
-                 git-ls-remote --tags "$remote" |
+                 git-ls-remote $upload_pack --tags "$remote" |
                  while read sha1 name
                  do
                        case "$name" in
@@ -367,7 +369,7 @@ fetch_main "$reflist"
 case "$no_tags$tags" in
 '')
        taglist=$(IFS=" " &&
-       git-ls-remote --tags "$remote" |
+       git-ls-remote $upload_pack --tags "$remote" |
        sed -ne 's|^\([0-9a-f]*\)[      ]\(refs/tags/.*\)^{}$|\1 \2|p' |
        while read sha1 name
        do