Merge branch 'ao/p4-has-branch-prefix-fix' into maint

diff --git a/commit.h b/commit.h
index 5d58be0017a8eb26cd3f58c1e3b0b610f684beba..0c923f05f73eacecf38602208c28211acd0b8f9e 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -147,6 +147,7 @@ struct pretty_print_context {
        int preserve_subject;
        struct date_mode date_mode;
        unsigned date_mode_explicit:1;
+       int expand_tabs_in_log;
        int need_8bit_cte;
        char *notes_message;
        struct reflog_walk_info *reflog_info;
@@ -160,6 +161,7 @@ struct pretty_print_context {
         * should not be counted on by callers.
         */
        struct string_list in_body_headers;
+       int graph_width;
 };
 
 struct userformat_want {