Merge branch 'tb/config-default'

diff --git a/object.h b/object.h
index 47d1b4902263c4059d8b27e17c7d7fc042dc6771..1b96073601f2cd239e7fe6923a078572ee820bcc 100644 (file)
--- a/object.h
+++ b/object.h
@@ -12,6 +12,16 @@ struct parsed_object_pool {
        struct alloc_state *tag_state;
        struct alloc_state *object_state;
        unsigned commit_count;
+
+       /* parent substitutions from .git/info/grafts and .git/shallow */
+       struct commit_graft **grafts;
+       int grafts_alloc, grafts_nr;
+
+       int is_shallow;
+       struct stat_validity *shallow_stat;
+       char *alternate_shallow_file;
+
+       int commit_graft_prepared;
 };
 
 struct parsed_object_pool *parsed_object_pool_new(void);