Merge branch 'jc/maint-1.6.0-keep-pack'

diff --git a/revision.h b/revision.h
index f63596ff45a120f38abfdb3d6ac2e84691b8ddc3..6e98b71b49a4db01761d45aa244424f2512c5a41 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -42,18 +42,22 @@ struct rev_info {
                        simplify_history:1,
                        lifo:1,
                        topo_order:1,
+                       simplify_merges:1,
+                       simplify_by_decoration:1,
                        tag_objects:1,
                        tree_objects:1,
                        blob_objects:1,
                        edge_hint:1,
                        limited:1,
                        unpacked:1,
-                       kept_pack_only:1,
                        boundary:2,
                        left_right:1,
                        rewrite_parents:1,
                        print_parents:1,
+                       show_source:1,
+                       show_decorations:1,
                        reverse:1,
+                       reverse_output_stage:1,
                        cherry_pick:1,
                        first_parent_only:1;
 
@@ -82,7 +86,7 @@ struct rev_info {
        int             nr, total;
        const char      *mime_boundary;
        char            *message_id;
-       const char      *ref_message_id;
+       struct string_list *ref_message_ids;
        const char      *add_signoff;
        const char      *extra_headers;
        const char      *log_reencode;
@@ -108,6 +112,7 @@ struct rev_info {
 
        struct reflog_walk_info *reflog_info;
        struct decoration children;
+       struct decoration merge_simplification;
 };
 
 #define REV_TREE_SAME          0
@@ -156,7 +161,4 @@ enum commit_action {
 
 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
 
-extern int has_sha1_kept_pack(const unsigned char *sha1, const struct rev_info *);
-extern int is_kept_pack(const struct packed_git *);
-
 #endif