status: add --porcelain output format

diff --git a/revision.h b/revision.h
index 6e98b71b49a4db01761d45aa244424f2512c5a41..fb74492714b9276d02992dbe1101efff2cbdb5e6 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -36,6 +36,7 @@ struct rev_info {
        unsigned int    dense:1,
                        prune:1,
                        no_merges:1,
+                       merges_only:1,
                        no_walk:1,
                        show_all:1,
                        remove_empty_trees:1,
@@ -85,6 +86,8 @@ struct rev_info {
        struct log_info *loginfo;
        int             nr, total;
        const char      *mime_boundary;
+       const char      *patch_suffix;
+       int             numbered_files;
        char            *message_id;
        struct string_list *ref_message_ids;
        const char      *add_signoff;
@@ -116,8 +119,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);
@@ -144,6 +148,8 @@ struct name_path {
        const char *elem;
 };
 
+char *path_name(const struct name_path *path, const char *name);
+
 extern void add_object(struct object *obj,
                       struct object_array *p,
                       struct name_path *path,