Merge branch 'jk/error-const-return'

diff --git a/commit.h b/commit.h
index b6ad8f3f307a46cd5a0555ab346abaa20013b13a..0f469e507db7b8517e4f37107d855b7877176085 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -89,6 +89,7 @@ struct pretty_print_context {
        char *notes_message;
        struct reflog_walk_info *reflog_info;
        const char *output_encoding;
+       int color;
 };
 
 struct userformat_want {