Whip post 1.5.3.3 maintenance series into shape.

diff --git a/revision.h b/revision.h
index 55e6b531ce3e5838f988ca1896484333e795f192..98a0a8f3fa9db4b2302dd31a4867ae824831b25c 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -47,6 +47,7 @@ struct rev_info {
                        left_right:1,
                        parents:1,
                        reverse:1,
+                       cherry_pick:1,
                        first_parent_only:1;
 
        /* Diff flags */
@@ -62,8 +63,8 @@ struct rev_info {
 
        /* Format info */
        unsigned int    shown_one:1,
-                       abbrev_commit:1,
-                       relative_date:1;
+                       abbrev_commit:1;
+       enum date_mode date_mode;
 
        const char **ignore_packed; /* pretend objects in these are unpacked */
        int num_ignore_packed;
@@ -78,7 +79,9 @@ struct rev_info {
        const char      *add_signoff;
        const char      *extra_headers;
        const char      *log_reencode;
+       const char      *subject_prefix;
        int             no_inline;
+       int             show_log_size;
 
        /* Filter by commit log message */
        struct grep_opt *grep_filter;
@@ -104,14 +107,12 @@ struct rev_info {
 #define REV_TREE_DIFFERENT     2
 
 /* revision.c */
-extern int rev_same_tree_as_empty(struct rev_info *, struct tree *t1);
-extern int rev_compare_tree(struct rev_info *, struct tree *t1, struct tree *t2);
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);
 extern int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def);
 extern int handle_revision_arg(const char *arg, struct rev_info *revs,int flags,int cant_be_filename);
 
-extern void prepare_revision_walk(struct rev_info *revs);
+extern int prepare_revision_walk(struct rev_info *revs);
 extern struct commit *get_revision(struct rev_info *revs);
 
 extern void mark_parents_uninteresting(struct commit *commit);