Merge branch 'sb/object-store-grafts' into sb/object-store-lookup

diff --git a/object-store.h b/object-store.h
index 695266891bf3e553cf4e5d2247bd3bca0fe52666..a3db17bbf5a70c9920181e26eeba5c348ad87671 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -71,8 +71,10 @@ struct packed_git {
        int index_version;
        time_t mtime;
        int pack_fd;
+       int index;              /* for builtin/pack-objects.c */
        unsigned pack_local:1,
                 pack_keep:1,
+                pack_keep_in_core:1,
                 freshened:1,
                 do_not_close:1,
                 pack_promisor:1;
@@ -196,7 +198,7 @@ extern int has_object_file_with_flags(const struct object_id *oid, int flags);
  * with the specified name.  This function does not respect replace
  * references.
  */
-extern int has_loose_object_nonlocal(const unsigned char *sha1);
+extern int has_loose_object_nonlocal(const struct object_id *);
 
 extern void assert_oid_type(const struct object_id *oid, enum object_type expect);