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>
---
git-clone.sh | 2 +- git-fetch.sh | 2 +- http-fetch.c | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-)
applies-to: f4d9606c4e4ca69203ea9211547083009b34196e f6bf6aee48c028a4166d4c5d54c8e3c136721e3c
Show changes to 3 files +4 −2
git-clone.sh, git-fetch.sh, http-fetch.c
diff --git a/git-clone.sh b/git-clone.sh index 4fdd652..aafcc18 100755 --- a/git-clone.sh +++ b/git-clone.sh @@ -23,7 +23,7 @@ fi http_fetch () { # $1 = Remote, $2 = Local - curl -nsf $curl_extra_args "$1" >"$2" + curl -nsfL $curl_extra_args "$1" >"$2" } clone_dumb_http () { diff --git a/git-fetch.sh b/git-fetch.sh index 31e5f4c..8564cbf 100755 --- 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") - 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 diff --git a/http-fetch.c b/http-fetch.c index ea8af1b..28d225c 100644 --- a/http-fetch.c +++ b/http-fetch.c @@ -269,6 +269,8 @@ static CURL* get_curl_handle(void) curl_low_speed_time); } + curl_easy_setopt(result, CURLOPT_FOLLOWLOCATION, 1); + return result; } --- 0.99.9.GIT