Browse Source

Silence confusing and false-positive curl error message

git-http-fetch spits out curl 404 error message when unable to fetch an object,
but that's confusing since no error really happened and the object is usually
found in a pack it tries right after that. And if the object still cannot be
retrieved, it will say another error message anyway. OTOH other HTTP errors
(403 etc) are likely fatal and the user should be still informed about them.

Signed-off-by: Petr Baudis <pasky@suse.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
maint
Petr Baudis 20 years ago committed by Junio C Hamano
parent
commit
e2029eb963
  1. 9
      http-fetch.c

9
http-fetch.c

@ -1095,9 +1095,12 @@ static int fetch_object(struct alt_base *repo, unsigned char *sha1)
} }


if (request->curl_result != CURLE_OK && request->http_code != 416) { if (request->curl_result != CURLE_OK && request->http_code != 416) {
ret = error("%s (curl_result = %d, http_code = %ld, sha1 = %s)", if (request->http_code == 404)
request->errorstr, request->curl_result, ret = -1; /* Be silent, it is probably in a pack. */
request->http_code, hex); else
ret = error("%s (curl_result = %d, http_code = %ld, sha1 = %s)",
request->errorstr, request->curl_result,
request->http_code, hex);
release_request(request); release_request(request);
return ret; return ret;
} }

Loading…
Cancel
Save