From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Mon, 8 Aug 2005 09:53:23 +0000 (+0100)
Subject: [PATCH] Make curl fail on server error
X-Git-Tag: v0.99.4~5^2~6
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=affa40d2f8c5e72af5896cf395ef77d4162908cd;p=git.git

[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>
---

diff --git a/git-clone-dumb-http b/git-clone-dumb-http
index 8203c676..50527086 100755
--- a/git-clone-dumb-http
+++ b/git-clone-dumb-http
@@ -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" && 
diff --git a/git-fetch-script b/git-fetch-script
index a0326f0e..24f0a5ec 100755
--- a/git-fetch-script
+++ b/git-fetch-script
@@ -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
diff --git a/git-ls-remote-script b/git-ls-remote-script
index 921d3f84..31cdac8b 100755
--- a/git-ls-remote-script
+++ b/git-ls-remote-script
@@ -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://* )