git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] format-patch: set diffstat width to 70 instead of default 80

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 22, 2018, 23:13 UTC
Message-ID
<xmqqbmhljxmi.fsf@gitster.mtv.corp.google.com>
In-Reply-To
<20180122123154.8301-1-pclouds@gmail.com>
Nguyễn Thái Ngọc Duy  <pclouds@gmail.com> writes:
Show 11 quoted lines
> Patches or cover letters generated by format-patch are meant to be
> exchanged as emails, most of the time. And since it's generally agreed
> that text in mails should be wrapped around 70 columns or so, make sure
> these diffstat follow the convention.
>
> I noticed this when I quoted a diffstat line [1]. Should we do something
> like this? diffstat is rarely quoted though so perhaps the stat width
> should be something like 75.
>
> t4052 fails but I don't think it's worth fixing until it's clear if it's
> worth doing this.

I guess you meant this as an RFC/PATCH; FWIW, I personally am in favor of this change.

Show 35 quoted lines
>
> [1] https://public-inbox.org/git/20180122121426.GD5980@ash/T/#u
>
> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
> ---
>  builtin/log.c | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/builtin/log.c b/builtin/log.c
> index 14fdf39165..6be79656c5 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -1061,6 +1061,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;
> +	opts.diffopt.stat_width = 70;
>  
>  	diff_setup_done(&opts);
>  
> @@ -1611,9 +1612,12 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
>  		die(_("--check does not make sense"));
>  
>  	if (!use_patch_format &&
> -		(!rev.diffopt.output_format ||
> -		 rev.diffopt.output_format == DIFF_FORMAT_PATCH))
> +	    (!rev.diffopt.output_format ||
> +	     rev.diffopt.output_format == DIFF_FORMAT_PATCH)) {
>  		rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY;
> +		if (!rev.diffopt.stat_width)
> +			rev.diffopt.stat_width = 70;
> +	}
>  
>  	/* Always generate a patch */
>  	rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
Previous: Nguyễn Thái Ngọc DuyNext: Jeff King
Message 2 of 17 in “format-patch: set diffstat width to 70 instead of default 80”
  1. format-patch: set diffstat width to 70 instead of default 80Nguyễn Thái Ngọc Duy, Jan 22, 2018
  2. Junio C HamanoJan 22, 2018
  3. Jeff KingJan 22, 2018
  4. Ævar Arnfjörð BjarmasonJan 23, 2018
  5. Jeff KingJan 23, 2018
  6. Duy NguyenJan 23, 2018
  7. Ævar Arnfjörð BjarmasonJan 23, 2018
  8. 0/2 wrap format-patch diffstats around 72 columnsNguyễn Thái Ngọc Duy, Jan 25, 2018
  9. 1/2 format-patch: keep cover-letter diffstat wrapped in 72 columnsNguyễn Thái Ngọc Duy, Jan 25, 2018
  10. 2/2 format-patch: reduce patch diffstat width to 72Nguyễn Thái Ngọc Duy, Jan 25, 2018
  11. Jeff KingJan 27, 2018
  12. Duy NguyenJan 30, 2018
  13. Jeff KingJan 27, 2018
  14. 0/2 wrap format-patch diffstats around 72 columnsNguyễn Thái Ngọc Duy, Feb 1, 2018
  15. 1/2 format-patch: keep cover-letter diffstat wrapped in 72 columnsNguyễn Thái Ngọc Duy, Feb 1, 2018
  16. 2/2 format-patch: reduce patch diffstat width to 72Nguyễn Thái Ngọc Duy, Feb 1, 2018
  17. Junio C HamanoFeb 2, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.