Merge branch 'jk/loose-object-cache-oid'

diff --git a/revision.h b/revision.h
index df684701b9386131e9243069a31cc60926b279f7..d32d62abc6a7e65ba04a9f25c5024d6f5bbb5f49 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -162,7 +162,6 @@ struct rev_info {
                        do_not_die_on_missing_tree:1,
 
                        /* for internal use only */
-                       allow_exclude_promisor_objects_opt:1,
                        exclude_promisor_objects:1;
 
        /* Diff flags */
@@ -298,7 +297,8 @@ struct setup_revision_opt {
        const char *def;
        void (*tweak)(struct rev_info *, struct setup_revision_opt *);
        const char *submodule;  /* TODO: drop this and use rev_info->repo */
-       int assume_dashdash;
+       unsigned int    assume_dashdash:1,
+                       allow_exclude_promisor_objects:1;
        unsigned revarg_opt;
 };