Merge branch 'jk/empty-pick-fix'

diff --git a/object.h b/object.h
index 47d1b4902263c4059d8b27e17c7d7fc042dc6771..3afd123d735d1d5ac45da096e889d00f0b901161 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);
@@ -43,7 +53,7 @@ struct object_array {
 
 /*
  * object flag allocation:
- * revision.h:               0---------10                                26
+ * revision.h:               0---------10                              2526
  * fetch-pack.c:             0----5
  * walker.c:                 0-2
  * upload-pack.c:                4       11----------------19