Merge fixes up to GIT 1.0.4

diff --git a/git-fetch.sh b/git-fetch.sh
index 31e5f4c7225df3d279b78f67ebd0f7a8c87ede40..767ca61ca6362b086e70b05f3442fcb4ad475c6a 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 #
-. git-sh-setup || die "Not a git archive"
+
+USAGE='<fetch-options> <repository> <refspec>...'
+. git-sh-setup
 . git-parse-remote
 _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
 _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
@@ -12,6 +14,7 @@ IFS="$LF"
 tags=
 append=
 force=
+verbose=
 update_head_ok=
 while case "$#" in 0) break ;; esac
 do
@@ -30,6 +33,12 @@ do
        --update-head-o|--update-head-ok)
                update_head_ok=t
                ;;
+       -v|--verbose)
+               verbose=Yes
+               ;;
+       -*)
+               usage
+               ;;
        *)
                break
                ;;
@@ -91,12 +100,12 @@ append_fetch_head () {
     then
        headc_=$(git-rev-parse --verify "$head_^0") || exit
        echo "$headc_   $not_for_merge_ $note_" >>"$GIT_DIR/FETCH_HEAD"
-       echo >&2 "* committish: $head_"
-       echo >&2 "  $note_"
+       [ "$verbose" ] && echo >&2 "* committish: $head_"
+       [ "$verbose" ] && echo >&2 "  $note_"
     else
        echo "$head_    not-for-merge   $note_" >>"$GIT_DIR/FETCH_HEAD"
-       echo >&2 "* non-commit: $head_"
-       echo >&2 "  $note_"
+       [ "$verbose" ] && echo >&2 "* non-commit: $head_"
+       [ "$verbose" ] && echo >&2 "  $note_"
     fi
     if test "$local_name_" != ""
     then
@@ -116,7 +125,7 @@ fast_forward_local () {
        then
                if now_=$(cat "$GIT_DIR/$1") && test "$now_" = "$2"
                then
-                       echo >&2 "* $1: same as $3"
+                       [ "$verbose" ] && echo >&2 "* $1: same as $3"
                else
                        echo >&2 "* $1: updating with $3"
                fi
@@ -230,7 +239,7 @@ do
            $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
            print "$u";
        ' "$remote_name")
-       head=$(curl -nsf $curl_extra_args "$remote/$remote_name_quoted") &&
+       head=$(curl -nsfL $curl_extra_args "$remote/$remote_name_quoted") &&
        expr "$head" : "$_x40\$" >/dev/null ||
                die "Failed to fetch $remote_name from $remote"
        echo >&2 Fetching "$remote_name from $remote" using http