From: Junio C Hamano <gitster@pobox.com>
To: "Michael Montalbo via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, "Michael Montalbo" <mmontalbo@gmail.com>,
"Elijah Newren" <newren@gmail.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Jeff King" <peff@peff.net>, "Thomas Rast" <tr@thomasrast.ch>,
"Patrick Steinhardt" <ps@pks.im>
Subject: Re: [PATCH 0/4] line-log: route -L output through the standard diff pipeline
Date: Fri, 06 Mar 2026 17:28:58 -0800 [thread overview]
Message-ID: <xmqqcy1gv351.fsf@gitster.g> (raw)
In-Reply-To: <pull.2065.git.1772845338.gitgitgadget@gmail.com> (Michael Montalbo via GitGitGadget's message of "Sat, 07 Mar 2026 01:02:14 +0000")
"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.
> 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.
> 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?
> 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.
.
next prev parent reply other threads:[~2026-03-07 1:29 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-07 1:02 [PATCH 0/4] line-log: route -L output through the standard diff pipeline Michael Montalbo via GitGitGadget
2026-03-07 1:02 ` [PATCH 1/4] line-log: fix crash when combined with pickaxe options Michael Montalbo via GitGitGadget
2026-03-07 1:02 ` [PATCH 2/4] line-log: route -L output through the standard diff pipeline Michael Montalbo via GitGitGadget
2026-03-07 1:02 ` [PATCH 3/4] t4211: add tests for -L with standard diff options Michael Montalbo via GitGitGadget
2026-03-07 1:02 ` [PATCH 4/4] doc: note that -L supports patch formatting and pickaxe options Michael Montalbo via GitGitGadget
2026-03-11 8:41 ` Kristoffer Haugsbakk
2026-03-11 17:35 ` Michael Montalbo
2026-03-07 1:28 ` Junio C Hamano [this message]
2026-03-07 1:37 ` [PATCH 0/4] line-log: route -L output through the standard diff pipeline Michael Montalbo
2026-03-07 2:05 ` Junio C Hamano
2026-03-07 2:10 ` Michael Montalbo
2026-03-17 2:21 ` [PATCH v2 " Michael Montalbo via GitGitGadget
2026-03-17 2:21 ` [PATCH v2 1/4] line-log: fix crash when combined with pickaxe options Michael Montalbo via GitGitGadget
2026-03-17 2:21 ` [PATCH v2 2/4] line-log: route -L output through the standard diff pipeline Michael Montalbo via GitGitGadget
2026-03-17 20:52 ` Junio C Hamano
2026-03-17 2:21 ` [PATCH v2 3/4] t4211: add tests for -L with standard diff options Michael Montalbo via GitGitGadget
2026-03-17 2:21 ` [PATCH v2 4/4] doc: note that -L supports patch formatting and pickaxe options Michael Montalbo via GitGitGadget
2026-03-31 21:49 ` [PATCH v2 0/4] line-log: route -L output through the standard diff pipeline Junio C Hamano
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=xmqqcy1gv351.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=mmontalbo@gmail.com \
--cc=newren@gmail.com \
--cc=peff@peff.net \
--cc=ps@pks.im \
--cc=szeder.dev@gmail.com \
--cc=tr@thomasrast.ch \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.