builtin rebase: support `--gpg-sign` option

diff --git a/object-store.h b/object-store.h
index 695266891bf3e553cf4e5d2247bd3bca0fe52666..e481f7ad41bd876df3fb98f1578c38f55fc288e5 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -2,6 +2,9 @@
 #define OBJECT_STORE_H
 
 #include "oidmap.h"
+#include "list.h"
+#include "sha1-array.h"
+#include "strbuf.h"
 
 struct alternate_object_database {
        struct alternate_object_database *next;
@@ -71,8 +74,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;
@@ -101,6 +106,9 @@ struct raw_object_store {
         */
        struct oidmap *replace_map;
 
+       struct commit_graph *commit_graph;
+       unsigned commit_graph_attempted : 1; /* if loading has been attempted */
+
        /*
         * private data
         *
@@ -196,7 +204,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);