Merge branch 'sb/grep-die-on-unreadable-index'

diff --git a/object-store.h b/object-store.h
index 1ff862c7f93fbe793af21acc963ea0f7ea8f1623..d683112fd7bbab5df7e8cd5656b497cb8fd2bda1 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;