t/lib-httpd/apache.conf: do not use LockFile in apache >= 2.4

diff --git a/revision.h b/revision.h
index cb5ab3513bc9982095e292119b9119d333556256..5da09ee3efa976b503cba5d13e347aad0f6c764c 100644 (file)
--- a/revision.h
+++ b/revision.h
@@ -41,6 +41,10 @@ struct rev_cmdline_info {
        } *rev;
 };
 
+#define REVISION_WALK_WALK 0
+#define REVISION_WALK_NO_WALK_SORTED 1
+#define REVISION_WALK_NO_WALK_UNSORTED 2
+
 struct rev_info {
        /* Starting list */
        struct commit_list *commits;
@@ -62,7 +66,7 @@ struct rev_info {
        /* Traversal flags */
        unsigned int    dense:1,
                        prune:1,
-                       no_walk:1,
+                       no_walk:2,
                        show_all:1,
                        remove_empty_trees:1,
                        simplify_history:1,
@@ -107,6 +111,7 @@ struct rev_info {
 
        /* Format info */
        unsigned int    shown_one:1,
+                       shown_dashes:1,
                        show_merge:1,
                        show_notes:1,
                        show_notes_given:1,
@@ -130,6 +135,7 @@ struct rev_info {
        const char      *mime_boundary;
        const char      *patch_suffix;
        int             numbered_files;
+       int             reroll_count;
        char            *message_id;
        struct string_list *ref_message_ids;
        const char      *add_signoff;
@@ -138,6 +144,7 @@ struct rev_info {
        const char      *subject_prefix;
        int             no_inline;
        int             show_log_size;
+       struct string_list *mailmap;
 
        /* Filter by commit log message */
        struct grep_opt grep_filter;