git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Make curl fail on server error
@ 2005-08-08  9:53 Catalin Marinas
  0 siblings, 0 replies; only message in thread
From: Catalin Marinas @ 2005-08-08  9:53 UTC (permalink / raw)
  To: git

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

 git-clone-dumb-http  |    2 +-
 git-fetch-script     |    2 +-
 git-ls-remote-script |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/git-clone-dumb-http b/git-clone-dumb-http
--- 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
--- 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
--- 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://* )

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2005-08-08  9:55 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-08-08  9:53 [PATCH] Make curl fail on server error Catalin Marinas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).