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

Re: [PATCH 0/4] line-log: route -L output through the standard diff pipeline

From
Michael Montalbo <mmontalbo@gmail.com>
Date
Mar 7, 2026, 01:37 UTC
Message-ID
<CAC2QwmLnLqMcWc8az6pVzz0oEdY282Nq-Lun5OrHaqHUiVE_9w@mail.gmail.com>
In-Reply-To
<xmqqcy1gv351.fsf@gitster.g>
On Fri, Mar 6, 2026 at 5:29 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 11 quoted lines
>
> "Michael Montalbo via GitGitGadget" <gitgitgadget@gmail.com> writes:
>
> > git log -L has bypassed the standard diff pipeline since its introduction,
> > using dump_diff_hacky() to hand-roll diff output. A NEEDSWORK comment has
> > acknowledged this from the start. This series removes dump_diff_hacky() and
> > routes -L output through builtin_diff() / fn_out_consume(), so that diff
> > formatting options like --word-diff, --color-moved, -w, and pickaxe options
> > (-S, -G) work with -L.
>
> Exciting.
:)
Show 23 quoted lines
> > User-visible output change: -L output now includes index lines, new file
> > mode headers, and funcname context in @@ headers that were previously
> > missing. Tools parsing -L output may need to handle these additional lines.
> >
> > Known limitations not addressed in this series:
> >
> >  * line_log_print() still calls show_log() and diff_flush() directly,
> >    bypassing log_tree_diff_flush(). The early return in log_tree_commit()
> >    (and its associated NEEDSWORK about no_free not being restored) is
> >    pre-existing. Restructuring -L to flow through log_tree_diff_flush() is a
> >    larger change that would affect separator and header logic; it is left
> >    for a follow-up.
>
> OK.  Previously all the output routines were hand-rolled, but this
> reduces the extent of deviation---as long as we are moving in the
> right direction, it is a good idea to find a good place to stop and
> leave the rest for later.
>
> >  * Non-patch diff formats (--raw, --numstat, --stat, etc.) remain
> >    unimplemented for -L.
>
> It would not hurt if these are omitted.
>
Makes sense. I can omit in a follow-up.
Show 8 quoted lines
> > Michael Montalbo (4): line-log: fix crash when combined with pickaxe options
> > line-log: route -L output through the standard diff pipeline t4211: add
> > tests for -L with standard diff options doc: note that -L supports patch
> > formatting and pickaxe options
>
> I am not sure what this bloc is, but it looks like a reflowed
> version of the list of commits below?
>
Yes, this was a mistake I made when crafting the cover letter.
Show 11 quoted lines
> > Michael Montalbo (4):
> >   line-log: fix crash when combined with pickaxe options
> >   line-log: route -L output through the standard diff pipeline
> >   t4211: add tests for -L with standard diff options
> >   doc: note that -L supports patch formatting and pickaxe options
>
> Let me throw in a handful of names found in the output of "git
> shortlog --no-merges -s -n line-log.[ch]" on the Cc: line to solicit
> help.
> .
>
Great! Thank you for your help on the review!
Previous: Junio C HamanoNext: Junio C Hamano
Message 9 of 18 in “line-log: route -L output through the standard diff pipeline”
  1. 0/4 line-log: route -L output through the standard diff pipelineMichael Montalbo via GitGitGadget, Mar 7, 2026
  2. 1/4 line-log: fix crash when combined with pickaxe optionsMichael Montalbo via GitGitGadget, Mar 7, 2026
  3. 2/4 line-log: route -L output through the standard diff pipelineMichael Montalbo via GitGitGadget, Mar 7, 2026
  4. 3/4 t4211: add tests for -L with standard diff optionsMichael Montalbo via GitGitGadget, Mar 7, 2026
  5. 4/4 doc: note that -L supports patch formatting and pickaxe optionsMichael Montalbo via GitGitGadget, Mar 7, 2026
  6. Kristoffer HaugsbakkMar 11, 2026
  7. Michael MontalboMar 11, 2026
  8. Junio C HamanoMar 7, 2026
  9. Michael MontalboMar 7, 2026
  10. Junio C HamanoMar 7, 2026
  11. Michael MontalboMar 7, 2026
  12. 0/4 line-log: route -L output through the standard diff pipelineMichael Montalbo via GitGitGadget, Mar 17, 2026
  13. 1/4 line-log: fix crash when combined with pickaxe optionsMichael Montalbo via GitGitGadget, Mar 17, 2026
  14. 2/4 line-log: route -L output through the standard diff pipelineMichael Montalbo via GitGitGadget, Mar 17, 2026
  15. Junio C HamanoMar 17, 2026
  16. 3/4 t4211: add tests for -L with standard diff optionsMichael Montalbo via GitGitGadget, Mar 17, 2026
  17. 4/4 doc: note that -L supports patch formatting and pickaxe optionsMichael Montalbo via GitGitGadget, Mar 17, 2026
  18. Junio C HamanoMar 31, 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.