Let git-clone/git-fetch follow HTTP redirections

Otherwise, git-clone silently failed to clone a remote
repository where redirections (ie. a response with a
"Location" header line) are used.

This includes the fixes from Nick Hengeveld.

Signed-off-by: Josef Weidendorfer <Josef.Weidendorfer@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/git-clone.sh b/git-clone.sh
index 4fdd6525148d50bd3a014bfc0f60eefd0f16efb9..aafcc18abafb8befd82165587cc9142ed42eb009 100755 (executable)
--- a/git-clone.sh
+++ b/git-clone.sh
@@ -23,7 +23,7 @@ fi
 
 http_fetch () {
        # $1 = Remote, $2 = Local
 
 http_fetch () {
        # $1 = Remote, $2 = Local

-       curl -nsf $curl_extra_args "$1" >"$2"
+       curl -nsfL $curl_extra_args "$1" >"$2"

 }
 
 clone_dumb_http () {
 }
 
 clone_dumb_http () {

diff --git a/git-fetch.sh b/git-fetch.sh
index 31e5f4c7225df3d279b78f67ebd0f7a8c87ede40..8564cbfd7abaf0c5aff8d79d660f40b6747d25a0 100755 (executable)
--- a/git-fetch.sh
+++ b/git-fetch.sh
@@ -230,7 +230,7 @@ do
            $u =~ s{([^-a-zA-Z0-9/.])}{sprintf"%%%02x",ord($1)}eg;
            print "$u";
        ' "$remote_name")
            $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
        expr "$head" : "$_x40\$" >/dev/null ||
                die "Failed to fetch $remote_name from $remote"
        echo >&2 Fetching "$remote_name from $remote" using http

diff --git a/http-fetch.c b/http-fetch.c
index 88b74b434194b0648c21225bac9ecfbe05491a93..99921cc8da13abc33b389f9df691f56200d20ef3 100644 (file)
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -269,6 +269,8 @@ static CURL* get_curl_handle(void)
                                 curl_low_speed_time);
        }
 
                                 curl_low_speed_time);
        }
 

+       curl_easy_setopt(result, CURLOPT_FOLLOWLOCATION, 1);
+

        return result;
 }
 
        return result;
 }