Merge branch 'maint'

diff --git a/revision.h b/revision.h
index bfe27071bfff3dda4a468844b0cc9195c67b5625..227164cf7096d3b0642714b18ee345738684da79 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -85,8 +85,10 @@ struct rev_info {
        struct log_info *loginfo;
        int             nr, total;
        const char      *mime_boundary;
+       const char      *patch_suffix;
+       int             numbered_files;
        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;
@@ -116,8 +118,9 @@ struct rev_info {
 };
 
 #define REV_TREE_SAME          0
-#define REV_TREE_NEW           1
-#define REV_TREE_DIFFERENT     2
+#define REV_TREE_NEW           1       /* Only new files */
+#define REV_TREE_OLD           2       /* Only files removed */
+#define REV_TREE_DIFFERENT     3       /* Mixed changes */
 
 /* revision.c */
 void read_revisions_from_stdin(struct rev_info *revs);