Merge branch 'jk/empty-pick-fix'

diff --git a/object.h b/object.h
index ec908f9bcc1c1b4315a000162f43cd8f3bb0736f..3afd123d735d1d5ac45da096e889d00f0b901161 100644 (file)
--- a/object.h
+++ b/object.h
@@ -16,6 +16,12 @@ struct parsed_object_pool {
        /* 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);
@@ -45,10 +51,9 @@ struct object_array {
 
 #define OBJECT_ARRAY_INIT { 0, 0, NULL }
 
-#define TYPE_BITS   3
 /*
  * 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
@@ -57,12 +62,13 @@ struct object_array {
  * bundle.c:                                        16
  * http-push.c:                                     16-----19
  * commit.c:                                        16-----19
- * sha1_name.c:                                              20
+ * sha1-name.c:                                              20
  * list-objects-filter.c:                                      21
  * builtin/fsck.c:           0--3
  * builtin/index-pack.c:                                     2021
  * builtin/pack-objects.c:                                   20
  * builtin/reflog.c:                   10--12
+ * builtin/show-branch.c:    0-------------------------------------------26
  * builtin/unpack-objects.c:                                 2021
  */
 #define FLAG_BITS  27