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
Date: Thu, 24 Jan 2019 07:26:03 -0500 [thread overview]
Message-ID: <20190124122603.GA10415@sigill.intra.peff.net> (raw)
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
next reply other threads:[~2019-01-24 12:26 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 12:26 Jeff King [this message]
2019-01-24 12:27 ` [PATCH 1/6] t4006: resurrect commented-out tests Jeff King
2019-01-24 18:18 ` Stefan Beller
2019-01-24 12:32 ` [PATCH 2/6] diff: clear emitted_symbols flag after use Jeff King
2019-01-24 18:55 ` Stefan Beller
2019-01-24 19:11 ` Jeff King
2019-01-24 20:18 ` Junio C Hamano
2019-01-24 20:36 ` Stefan Beller
2019-01-24 21:17 ` Jeff King
2019-01-24 21:15 ` Jeff King
2019-01-24 12:33 ` [PATCH 3/6] combine-diff: factor out stat-format mask Jeff King
2019-01-24 12:34 ` [PATCH 4/6] combine-diff: treat --shortstat like --stat Jeff King
2019-01-24 18:58 ` David Turner
2019-01-24 19:02 ` Stefan Beller
2019-01-24 12:35 ` [PATCH 5/6] combine-diff: treat --summary " Jeff King
2019-01-24 19:14 ` Stefan Beller
2019-01-24 19:23 ` Jeff King
2019-01-24 12:36 ` [PATCH 6/6] combine-diff: treat --dirstat " Jeff King
2019-01-24 19:21 ` [PATCH 0/6] some diff --cc --stat fixes Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190124122603.GA10415@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=novalis@novalis.org \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).