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

[PATCH 0/4] diff dry-run cleanups

From
Jeff King <peff@peff.net>
Date
Oct 24, 2025, 17:05 UTC
Message-ID
<20251024170522.GA2344972@coredump.intra.peff.net>

Since we were talking about this topic so much this week, I wanted to collect these patches before they fell out of my head. They would go on top of ly/diff-name-only-with-diff-from-content.

  [1/4]: diff: send external diff output to diff_options.file
    This one is actually a bug-fix that we found along the way, and
    could be applied completely independently. AFAICT the bug has been
    there since 2008, though, so probably not super urgent. ;)
  [2/4]: diff: drop save/restore of color_moved in dry-run mode
    This one is hopefully a no-brainer simplification.
  [3/4]: diff: replace diff_options.dry_run flag with NULL file
  [4/4]: diff: drop dry-run redirection to /dev/null
    And then these ones clean up our extra layer of fixes, converting
    any missed dry_run checks into segfaults. But we hope there aren't
    any after Lidong's fixes. :) So possibly controversial, but I think
    the end result is nicer to read.
 diff.c                   | 56 +++++++++++-----------------------------
 diff.h                   |  2 --
 t/t4020-diff-external.sh | 10 +++++++
 3 files changed, 25 insertions(+), 43 deletions(-)
-Peff
Next: Jeff King
Message 1 of 7 in “diff dry-run cleanups”
  1. 0/4 diff dry-run cleanupsJeff King, Oct 24, 2025
  2. 1/4 diff: send external diff output to diff_options.fileJeff King, Oct 24, 2025
  3. 2/4 diff: drop save/restore of color_moved in dry-run modeJeff King, Oct 24, 2025
  4. 3/4 diff: replace diff_options.dry_run flag with NULL fileJeff King, Oct 24, 2025
  5. Junio C HamanoOct 24, 2025
  6. 4/4 diff: drop dry-run redirection to /dev/nullJeff King, Oct 24, 2025
  7. 5/4 diff: simplify run_external_diff() quiet logicJeff King, Oct 24, 2025

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.