git-fetch.sh printed protocol fix

We have supported https:// protocol for some time and in 1.4.3
added ftp:// protocol.  The transfer were still reported to be
over http.

[jc: Tuncer used substring parameter substitution ${remote%%:*}
but I am deferring it to a later day.  We should replace
colon-expr with substring substitution after everybody's shell
can grok it someday, but we are not in a hurry. ]

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

diff --git a/git-fetch.sh b/git-fetch.sh
index 79222fbb1a4bf3205f3225feafc96aa43aace87c..a674c8c5744c5f8b3826336fc9db4e53fd0942b3 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -287,6 +287,7 @@ fetch_main () {
       # There are transports that can fetch only one head at a time...
       case "$remote" in
       http://* | https://* | ftp://*)
       # There are transports that can fetch only one head at a time...
       case "$remote" in
       http://* | https://* | ftp://*)

+         proto=`expr "$remote" : '\([^:]*\):'`

          if [ -n "$GIT_SSL_NO_VERIFY" ]; then
              curl_extra_args="-k"
          fi
          if [ -n "$GIT_SSL_NO_VERIFY" ]; then
              curl_extra_args="-k"
          fi


@@ -310,7 +311,7 @@ fetch_main () {
          done
          expr "z$head" : "z$_x40\$" >/dev/null ||
              die "Failed to fetch $remote_name from $remote"
          done
          expr "z$head" : "z$_x40\$" >/dev/null ||
              die "Failed to fetch $remote_name from $remote"

-         echo >&2 Fetching "$remote_name from $remote" using http
+         echo >&2 "Fetching $remote_name from $remote using $proto"

          git-http-fetch -v -a "$head" "$remote/" || exit
          ;;
       rsync://*)
          git-http-fetch -v -a "$head" "$remote/" || exit
          ;;
       rsync://*)