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

Re: [PATCH 0/3] line-log: integrate -L with the standard log output pipeline

From
D. Ben Knoble <ben.knoble@gmail.com>
Date
May 22, 2026, 18:48 UTC
Message-ID
<CALnO6CApG=26Fdx2LZELf6rfTC9SgUu9W4R=K6-ozN0C15LJ0A@mail.gmail.com>
In-Reply-To
<pull.2094.git.1777349126.gitgitgadget@gmail.com>
Hi Michael,

On Tue, Apr 28, 2026 at 12:06 AM Michael Montalbo via GitGitGadget <gitgitgadget@gmail.com> wrote:

Show 11 quoted lines
>
> Since its introduction, git log -L has short-circuited from
> log_tree_commit() into its own output function, bypassing log_tree_diff()
> and log_tree_diff_flush(). This skips no_free save/restore,
> always_show_header, diff_free() cleanup, and means that pickaxe (-S, -G,
> --find-object) and --diff-filter cannot suppress commits whose pairs are all
> filtered out, because show_log() runs before diffcore_std().
>
> This series restructures the flow so that -L goes through the same
> log_tree_diff() -> log_tree_diff_flush() path as normal single-parent and
> merge diffs, then uses that to enable several non-patch diff formats.

Cleanup by itself to shrink the number of concepts in the code is already a good thing IMO, so getting additional features out of it is even nicer.

Show 6 quoted lines
> Patch 1: revision: move -L setup before output_format-to-diff derivation
>
> Preparatory reorder in setup_revisions(). The -L block sets a default
> DIFF_FORMAT_PATCH when no format is requested; move it before the derivation
> of revs->diff from output_format so the default is visible to that check. No
> behavior change on its own.
Straightforward, nice.
Show 9 quoted lines
>
> Patch 2: line-log: integrate -L output with the standard log-tree pipeline
>
> Rename line_log_print() to line_log_queue_pairs(), stripping it down to only
> queue pre-computed filepairs. log_tree_diff_flush() handles show_log(),
> diffcore_std(), and diff_flush(). This fixes pickaxe and --diff-filter
> suppression, and aligns the commit/diff separator with the rest of log
> output. Also rejects --full-diff, which is meaningless when filepairs are
> pre-computed.

At first I questioned the removal of the DIFF_FORMAT_NO_OUTPUT conditional in line_log_queue_pairs, but now that it only queues pairs it shouldn't be checking output formats. Good.

I also noted that log_tree_diff() returns the result of log_tree_diff_flush() in the -L case, which is a bit different from the other patterns. I think the difference is that the other cases have some conditional logic around the log_tree_diff_flush cases (?) but I'm not sure. Perhaps that branch should also be looking at opt->loginfo ?

Finally, I wonder if in describing the removal of the early return:
> - Remove the early return in log_tree_commit() that bypassed
>   no_free save/restore, always_show_header, and diff_free().

we might want to be more explicit that this is _because_ line-level diff is now handled in the regular pipeline?

[I suppose we could, in theory, split the rejection of --full-diff to a separate prep commit, idk.j]

Show 7 quoted lines
> Patch 3: line-log: allow non-patch diff formats with -L
>
> Expand the allowlist to accept --raw, --name-only, --name-status, and
> --summary. These only read filepair metadata already set by the line-log
> machinery. Diff stat formats (--stat, --numstat, --shortstat, --dirstat)
> remain blocked because they call compute_diffstat() on full blob content and
> would show whole-file statistics rather than range-scoped ones.
Short and sweet.

The stat formats are kind of like --full-diff, and I think they should probably all be rejected or all allowed: since the stats are based on the full-diff, it makes sense to enable them if we can also make -L + --full-diff semantically sensible.

Otherwise, we'd need to find a way to make the stat formats scoped for -L.
Show 22 quoted lines
> Michael Montalbo (3):
>   revision: move -L setup before output_format-to-diff derivation
>   line-log: integrate -L output with the standard log-tree pipeline
>   line-log: allow non-patch diff formats with -L
>
>  Documentation/line-range-options.adoc         | 10 +-
>  line-log.c                                    | 30 ++----
>  line-log.h                                    |  2 +-
>  log-tree.c                                    |  9 +-
>  revision.c                                    | 25 +++--
>  t/t4211-line-log.sh                           | 99 ++++++++++++++++---
>  t/t4211/sha1/expect.parallel-change-f-to-main |  1 -
>  .../sha256/expect.parallel-change-f-to-main   |  1 -
>  8 files changed, 120 insertions(+), 57 deletions(-)
>
>
> base-commit: 9f223ef1c026d91c7ac68cc0211bde255dda6199
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2094%2Fmmontalbo%2Fmm%2Fline-log-use-log-tree-diff-flush-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2094/mmontalbo/mm/line-log-use-log-tree-diff-flush-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/2094
> --
> gitgitgadget
A few other comments:
- Tests should use test_grep; some do, but some don't.
- There is one occurrence of "sed | grep" that I wonder if we want to
rewrite to avoid issues with exit status one side of the pipe?
Thanks for working on this!

[Apologies for the unusual review format; this was easier for me at the moment than digging up the individual patches, and I don't think _most_ of the review would benefit from spreading out across multiple mails.]

-- 
D. Ben Knoble
Previous: Junio C HamanoNext: Michael Montalbo via GitGitGadget
Message 6 of 20 in “line-log: integrate -L with the standard log output pipeline”
  1. 0/3 line-log: integrate -L with the standard log output pipelineMichael Montalbo via GitGitGadget, Apr 28, 2026
  2. 1/3 revision: move -L setup before output_format-to-diff derivationMichael Montalbo via GitGitGadget, Apr 28, 2026
  3. 2/3 line-log: integrate -L output with the standard log-tree pipelineMichael Montalbo via GitGitGadget, Apr 28, 2026
  4. 3/3 line-log: allow non-patch diff formats with -LMichael Montalbo via GitGitGadget, Apr 28, 2026
  5. Junio C HamanoMay 12, 2026
  6. D. Ben KnobleMay 22, 2026
  7. 0/3 line-log: integrate -L with the standard log output pipelineMichael Montalbo via GitGitGadget, May 25, 2026
  8. 1/3 revision: move -L setup before output_format-to-diff derivationMichael Montalbo via GitGitGadget, May 25, 2026
  9. 2/3 line-log: integrate -L output with the standard log-tree pipelineMichael Montalbo via GitGitGadget, May 25, 2026
  10. 3/3 line-log: allow non-patch diff formats with -LMichael Montalbo via GitGitGadget, May 25, 2026
  11. D. Ben KnobleMay 27, 2026
  12. Junio C HamanoMay 28, 2026
  13. Michael MontalboMay 28, 2026
  14. 0/3 line-log: integrate -L with the standard log output pipelineMichael Montalbo via GitGitGadget, May 28, 2026
  15. 1/3 revision: move -L setup before output_format-to-diff derivationMichael Montalbo via GitGitGadget, May 28, 2026
  16. 2/3 line-log: integrate -L output with the standard log-tree pipelineMichael Montalbo via GitGitGadget, May 28, 2026
  17. 3/3 line-log: allow non-patch diff formats with -LMichael Montalbo via GitGitGadget, May 28, 2026
  18. Ben KnobleMay 29, 2026
  19. Junio C HamanoJun 1, 2026
  20. Michael MontalboMay 24, 2026

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.