Merge branch 'jc/simpack' into next

diff --git a/blob.c b/blob.c
index c800cd3905e2a4e97098064a588e15c0ae33a0b0..c1fdd861c3dedbbd670fcf07989501fd0f9b5fda 100644 (file)
--- a/blob.c
+++ b/blob.c
@@ -1,15 +1,14 @@
-#include "blob.h"
 #include "cache.h"
+#include "blob.h"
 #include <stdlib.h>
 
 const char *blob_type = "blob";
 
-struct blob *lookup_blob(unsigned char *sha1)
+struct blob *lookup_blob(const unsigned char *sha1)
 {
        struct object *obj = lookup_object(sha1);
        if (!obj) {
-               struct blob *ret = xmalloc(sizeof(struct blob));
-               memset(ret, 0, sizeof(struct blob));
+               struct blob *ret = xcalloc(1, sizeof(struct blob));
                created_object(sha1, &ret->object);
                ret->object.type = blob_type;
                return ret;