Merge branch 'jc/lockfile' into next

diff --git a/blob.h b/blob.h
index 5cbf6d65ee88e1e0c0f1153af4aa7f80c3c48c16..ea5d9e9f8b63be2c7048d19ee53feb06b0795c80 100644 (file)
--- a/blob.h
+++ b/blob.h
@@ -9,6 +9,10 @@ struct blob {
        struct object object;
 };
 
-struct blob *lookup_blob(unsigned char *sha1);
+struct blob *lookup_blob(const unsigned char *sha1);
+
+int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size);
+
+int parse_blob(struct blob *item);
 
 #endif /* BLOB_H */