format-patch: keep cover-letter diffstat wrapped in 72 columns

We already wrap shortlog around 72 columns in cover letters. Do the same
for diffstat (also in cover letters).

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/log.c b/builtin/log.c
index 46b4ca13e5c11ff43c15d80e618914e671ff17a0..96af8974030c49b9ab5774be657f12c6542d6186 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -29,6 +29,8 @@
 #include "gpg-interface.h"
 #include "progress.h"
 
 #include "gpg-interface.h"
 #include "progress.h"
 

+#define MAIL_DEFAULT_WRAP 72
+

 /* Set a default date-time format for git log ("log.date" config variable) */
 static const char *default_date_mode = NULL;
 
 /* Set a default date-time format for git log ("log.date" config variable) */
 static const char *default_date_mode = NULL;
 


@@ -1044,7 +1046,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 
        shortlog_init(&log);
        log.wrap_lines = 1;
 
        shortlog_init(&log);
        log.wrap_lines = 1;

-       log.wrap = 72;
+       log.wrap = MAIL_DEFAULT_WRAP;

        log.in1 = 2;
        log.in2 = 4;
        log.file = rev->diffopt.file;
        log.in1 = 2;
        log.in2 = 4;
        log.file = rev->diffopt.file;


@@ -1061,6 +1063,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 
        memcpy(&opts, &rev->diffopt, sizeof(opts));
        opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
 
        memcpy(&opts, &rev->diffopt, sizeof(opts));
        opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;

+       opts.stat_width = MAIL_DEFAULT_WRAP;

 
        diff_setup_done(&opts);
 
 
        diff_setup_done(&opts);