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

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

From
Jeff King <peff@peff.net>
Date
Jan 24, 2019, 12:26 UTC
Message-ID
<20190124122603.GA10415@sigill.intra.peff.net>

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: Jeff King
Message 1 of 19 in “some diff --cc --stat fixes”
  1. 0/6 some diff --cc --stat fixesJeff King, Jan 24, 2019
  2. 1/6 t4006: resurrect commented-out testsJeff King, Jan 24, 2019
  3. Stefan BellerJan 24, 2019
  4. 2/6 diff: clear emitted_symbols flag after useJeff King, Jan 24, 2019
  5. Stefan BellerJan 24, 2019
  6. Jeff KingJan 24, 2019
  7. Junio C HamanoJan 24, 2019
  8. Stefan BellerJan 24, 2019
  9. Jeff KingJan 24, 2019
  10. Jeff KingJan 24, 2019
  11. 3/6 combine-diff: factor out stat-format maskJeff King, Jan 24, 2019
  12. 4/6 combine-diff: treat --shortstat like --statJeff King, Jan 24, 2019
  13. David TurnerJan 24, 2019
  14. Stefan BellerJan 24, 2019
  15. 5/6 combine-diff: treat --summary like --statJeff King, Jan 24, 2019
  16. Stefan BellerJan 24, 2019
  17. Jeff KingJan 24, 2019
  18. 6/6 combine-diff: treat --dirstat like --statJeff King, Jan 24, 2019
  19. Stefan BellerJan 24, 2019

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.