[PATCH] Make curl fail on server error
Some http servers return an HTML error page and git reads it as normal data. Adding -f option makes curl fail silently. Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
3c4e8a636f
commit
affa40d2f8
@ -14,7 +14,7 @@ if [ -n "$GIT_SSL_NO_VERIFY" ]; then
|
||||
fi
|
||||
http_fetch () {
|
||||
# $1 = Remote, $2 = Local
|
||||
curl -ns $curl_extra_args "$1" >"$2"
|
||||
curl -nsf $curl_extra_args "$1" >"$2"
|
||||
}
|
||||
|
||||
cd "$D" &&
|
||||
|
@ -15,7 +15,7 @@ http://* | https://*)
|
||||
fi
|
||||
_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" &&
|
||||
head=$(curl -ns $curl_extra_args "$merge_repo/$merge_head") &&
|
||||
head=$(curl -nsf $curl_extra_args "$merge_repo/$merge_head") &&
|
||||
expr "$head" : "$_x40\$" >/dev/null || {
|
||||
echo >&2 "Failed to fetch $merge_head from $merge_repo"
|
||||
exit 1
|
||||
|
@ -46,7 +46,7 @@ http://* | https://* )
|
||||
if [ -n "$GIT_SSL_NO_VERIFY" ]; then
|
||||
curl_extra_args="-k"
|
||||
fi
|
||||
curl -ns $curl_extra_args "$peek_repo/info/refs" || exit 1
|
||||
curl -nsf $curl_extra_args "$peek_repo/info/refs" || exit 1
|
||||
;;
|
||||
|
||||
rsync://* )
|
||||
|
Loading…
Reference in New Issue
Block a user