Merge branch 'pw/rebase-i-internal'

diff --git a/http.h b/http.h
index c197e4ff79476dc25d6fba6b3eb482f57c909c7c..b429f1cf042bbb61e97e41cd1aacb012c4db834e 100644 (file)
--- a/http.h
+++ b/http.h
@@ -234,7 +234,7 @@ struct http_object_request {
        long http_code;
        struct object_id oid;
        struct object_id real_oid;
-       git_SHA_CTX c;
+       git_hash_ctx c;
        git_zstream stream;
        int zret;
        int rename;