Merge branch 'az/instaweb-py3-http-server'

diff --git a/revision.h b/revision.h
index 7987bfcd2e9bd6ee7bac4f1cbeb10af17ab40b50..52e5a88ff5725862dced5c72fbc2aa6435b94e3b 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -161,7 +161,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 */
@@ -297,7 +296,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;
 };