Re: [ANNOUNCE] Git v2.20.0-rc1
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Nov 22, 2018, 15:58 UTC
- Message-ID
- <87ftvt14uw.fsf@evledraar.gmail.com>
- In-Reply-To
- <xmqqmuq25ufc.fsf@gitster-ct.c.googlers.com>
On Wed, Nov 21 2018, Junio C Hamano wrote:
> * The "--no-patch" option, which can be used to get a high-level > overview without the actual line-by-line patch difference shown, of > the "range-diff" command was earlier broken, which has been > corrected.
There's a regression related to this that I wanted to send a headsup for, but don't have time to fix today. Now range-diff in format-patch includes --stat output. See e.g. my https://public-inbox.org/git/20181122132823.9883-1-avarab@gmail.com/
Preliminary patch:
builtin/log.c | 3 +++ t/t3206-range-diff.sh | 2 ++ 2 files changed, 5 insertions(+)
diff --git a/builtin/log.c b/builtin/log.c index 0fe6f9ba1e..fdaba480d2 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -1094,9 +1094,12 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, } if (rev->rdiff1) { + const int oldfmt = rev->diffopt.output_format; fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title); + rev->diffopt.output_format &= ~(DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY); show_range_diff(rev->rdiff1, rev->rdiff2, rev->creation_factor, 1, &rev->diffopt); + rev->diffopt.output_format = oldfmt; } } diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh index e497c1358f..2e913542f3 100755 --- a/t/t3206-range-diff.sh +++ b/t/t3206-range-diff.sh @@ -248,8 +248,10 @@ test_expect_success 'dual-coloring' ' for prev in topic master..topic do test_expect_success "format-patch --range-diff=$prev" ' + cat actual && git format-patch --stdout --cover-letter --range-diff=$prev \ master..unmodified >actual && + ! grep "a => b" actual && grep "= 1: .* s/5/A" actual && grep "= 2: .* s/4/A" actual && grep "= 3: .* s/11/B" actual &&