From: Johannes Schindelin Date: Wed, 11 Nov 2020 12:28:16 +0000 (+0000) Subject: add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers X-Git-Tag: v2.30.0-rc0~29^2~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=decc9ee4eaf2c33c28e2958439d276904a2ce279;p=thirdparty%2Fgit.git add -p (built-in): imitate `xdl_format_hunk_hdr()` generating hunk headers In libxdiff, imitating GNU diff, the hunk headers only show the line count if it is different from 1. When splitting hunks, the Perl version of `git add -p` already imitates this. Let's do the same in the built-in version of said command. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/add-patch.c b/add-patch.c index bd94bd3a7c..55bd9d4f37 100644 --- a/add-patch.c +++ b/add-patch.c @@ -661,9 +661,14 @@ static void render_hunk(struct add_p_state *s, struct hunk *hunk, else new_offset += delta; - strbuf_addf(out, "@@ -%lu,%lu +%lu,%lu @@", - old_offset, header->old_count, - new_offset, header->new_count); + strbuf_addf(out, "@@ -%lu", old_offset); + if (header->old_count != 1) + strbuf_addf(out, ",%lu", header->old_count); + strbuf_addf(out, " +%lu", new_offset); + if (header->new_count != 1) + strbuf_addf(out, ",%lu", header->new_count); + strbuf_addstr(out, " @@"); + if (len) strbuf_add(out, p, len); else if (colored)