[0/6] some diff --cc --stat fixes

Message ID	20190124122603.GA10415@sigill.intra.peff.net (mailing list archive)
Headers	show Return-Path: <git-owner@kernel.org> Date: Thu, 24 Jan 2019 07:26:03 -0500 From: Jeff King <peff@peff.net> To: git@vger.kernel.org Cc: David Turner <novalis@novalis.org>, Stefan Beller <sbeller@google.com> Subject: [PATCH 0/6] some diff --cc --stat fixes Message-ID: <20190124122603.GA10415@sigill.intra.peff.net> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Sender: git-owner@vger.kernel.org Precedence: bulk
Series	some diff --cc --stat fixes \| expand [0/6] some diff --cc --stat fixes [1/6] t4006: resurrect commented-out tests [2/6] diff: clear emitted_symbols flag after use [3/6] combine-diff: factor out stat-format mask [4/6] combine-diff: treat --shortstat like --stat [5/6] combine-diff: treat --summary like --stat [6/6] combine-diff: treat --dirstat like --stat

Message ID

20190124122603.GA10415@sigill.intra.peff.net (mailing list archive)

Headers

Date: Thu, 24 Jan 2019 07:26:03 -0500
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: David Turner <novalis@novalis.org>,
        Stefan Beller <sbeller@google.com>
Subject: [PATCH 0/6] some diff --cc --stat fixes
Message-ID: <20190124122603.GA10415@sigill.intra.peff.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Sender: git-owner@vger.kernel.org
Precedence: bulk

Series

some diff --cc --stat fixes | expand

Message

Jeff King Jan. 24, 2019, 12:26 p.m. UTC

This started as a follow-up to my "something like this" bug-fix from
last July:

 https://public-inbox.org/git/20180710203438.GB6886@sigill.intra.peff.net/

(better late than never). But in the course of that, I discovered
another really weird and interesting bug with --color-moved. This fixes
both, along with some related cases.

-Peff

  [1/6]: t4006: resurrect commented-out tests
  [2/6]: diff: clear emitted_symbols flag after use
  [3/6]: combine-diff: factor out stat-format mask
  [4/6]: combine-diff: treat --shortstat like --stat
  [5/6]: combine-diff: treat --summary like --stat
  [6/6]: combine-diff: treat --dirstat like --stat

 combine-diff.c                                | 17 ++--
 diff.c                                        |  4 +-
 t/t4006-diff-mode.sh                          | 55 +++++++------
 t/t4013-diff-various.sh                       |  9 +++
 .../diff.diff-tree_--cc_--shortstat_master    |  4 +
 t/t4013/diff.diff-tree_--cc_--summary_REVERSE |  6 ++
 .../diff.diff_--dirstat_--cc_master~1_master  |  3 +
 t/t4066-diff-emit-delay.sh                    | 79 +++++++++++++++++++
 8 files changed, 147 insertions(+), 30 deletions(-)
 create mode 100644 t/t4013/diff.diff-tree_--cc_--shortstat_master
 create mode 100644 t/t4013/diff.diff-tree_--cc_--summary_REVERSE
 create mode 100644 t/t4013/diff.diff_--dirstat_--cc_master~1_master
 create mode 100755 t/t4066-diff-emit-delay.sh

Comments

Stefan Beller Jan. 24, 2019, 7:21 p.m. UTC | #1

On Thu, Jan 24, 2019 at 4:26 AM Jeff King <peff@peff.net> wrote:
>
> This started as a follow-up to my "something like this" bug-fix from
> last July:
>
>  https://public-inbox.org/git/20180710203438.GB6886@sigill.intra.peff.net/
>
> (better late than never). But in the course of that, I discovered
> another really weird and interesting bug with --color-moved. This fixes
> both, along with some related cases.

I reviewed the whole series, and I like it except for the small nit
in the test setup. Arguably we can fix the --all tests once the time
comes, so I am in favor of taking this series as-is.

Thanks,
Stefan