Merge branch 'mt/threaded-grep-in-object-store'

[thirdparty/git.git] / object-store.h

diff --git a/object-store.h b/object-store.h
index 7c80e0d64cbadf6f4db28d21b2c99aae0e952a9e..3a010153b7b798e8eb1bfb331136773a90458f24 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -211,6 +211,14 @@ int hash_object_file_literally(const void *buf, unsigned long len,
                               const char *type, struct object_id *oid,
                               unsigned flags);
 
+/*
+ * Add an object file to the in-memory object store, without writing it
+ * to disk.
+ *
+ * Callers are responsible for calling write_object_file to record the
+ * object in persistent storage before writing any other new objects
+ * that reference it.
+ */
 int pretend_object_file(void *, unsigned long, enum object_type,
                        struct object_id *oid);
 
@@ -329,8 +337,6 @@ struct object_info {
 #define OBJECT_INFO_LOOKUP_REPLACE 1
 /* Allow reading from a loose object file of unknown/bogus type */
 #define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2
-/* Do not check cached storage */
-#define OBJECT_INFO_SKIP_CACHED 4
 /* Do not retry packed storage after checking packed and loose storage */
 #define OBJECT_INFO_QUICK 8
 /* Do not check loose object */