Merge refs/heads/master from .

diff --git a/http-pull.c b/http-pull.c
index bd6195537ff38375aae3b16391b33c9e4fa23368..e70ab39c03dc82e7f90afa43f8271ca4e3ae8206 100644 (file)
--- a/http-pull.c
+++ b/http-pull.c
@@ -67,6 +67,10 @@ static size_t fwrite_sha1_file(void *ptr, size_t eltsize, size_t nmemb,
        return size;
 }
 
+void prefetch(unsigned char *sha1)
+{
+}
+
 static int got_indices = 0;
 
 static struct packed_git *packs = NULL;