X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=http.h;h=4eb4e808e5731a3a9a650ca4c1efb3e471604d05;hb=7a4bb55f3a47756b5cd9ca2d120c7fe119439e81;hp=d305ca1dc7a3f931a81353c56060e98f4039c692;hpb=85eb0f162c5e47d37221496030dc49d10f3554a2;p=thirdparty%2Fgit.git

diff --git a/http.h b/http.h
index d305ca1dc7..4eb4e808e5 100644
--- a/http.h
+++ b/http.h
@@ -146,7 +146,6 @@ extern char *get_remote_object_url(const char *url, const char *hex,
 /* Options for http_get_*() */
 struct http_get_options {
 	unsigned no_cache:1,
-		 keep_error:1,
 		 initial_request:1;
 
 	/* If non-NULL, returns the content-type of the response. */
@@ -224,8 +223,8 @@ struct http_object_request {
 	CURLcode curl_result;
 	char errorstr[CURL_ERROR_SIZE];
 	long http_code;
-	unsigned char sha1[20];
-	unsigned char real_sha1[20];
+	struct object_id oid;
+	struct object_id real_oid;
 	git_SHA_CTX c;
 	git_zstream stream;
 	int zret;
@@ -234,7 +233,7 @@ struct http_object_request {
 };
 
 extern struct http_object_request *new_http_object_request(
-	const char *base_url, unsigned char *sha1);
+	const char *base_url, const struct object_id *oid);
 extern void process_http_object_request(struct http_object_request *freq);
 extern int finish_http_object_request(struct http_object_request *freq);
 extern void abort_http_object_request(struct http_object_request *freq);