From: "Michael Montalbo via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Michael Montalbo <mmontalbo@gmail.com>
Subject: [PATCH 0/4] line-log: route -L output through the standard diff pipeline
Date: Sat, 07 Mar 2026 01:02:14 +0000 [thread overview]
Message-ID: <pull.2065.git.1772845338.gitgitgadget@gmail.com> (raw)
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.
This replaces my earlier series "line-log: fix -L with pickaxe options" [1].
Patch 1 is the crash fix from that series (unchanged). Patch 2/2 from that
series (rejecting -S/-G) is dropped because this series makes those options
work instead of rejecting them.
[1]
https://lore.kernel.org/git/pull.2061.git.1772651484.gitgitgadget@gmail.com/
Patch 1 fixes a crash when combining -L with pickaxe options and a rename.
Patch 2 is the core change: callback wrappers filter xdiff's output to
tracked line ranges, and line ranges are carried on diff_filepair so each
file's ranges travel with its filepair through the pipeline. diffcore_std()
runs at output time, so pickaxe, --orderfile, and --diff-filter also work.
Patch 3 adds tests covering the newly-working options.
Patch 4 updates documentation.
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.
* Non-patch diff formats (--raw, --numstat, --stat, etc.) remain
unimplemented for -L.
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
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
Documentation/line-range-options.adoc | 4 +
diff.c | 279 +++++++++++++-
diffcore.h | 16 +
line-log.c | 196 ++--------
line-log.h | 14 +-
revision.c | 2 +
t/t4211-line-log.sh | 342 +++++++++++++++++-
t/t4211/sha1/expect.beginning-of-file | 4 +
t/t4211/sha1/expect.end-of-file | 11 +-
t/t4211/sha1/expect.move-support-f | 5 +
t/t4211/sha1/expect.multiple | 10 +-
t/t4211/sha1/expect.multiple-overlapping | 7 +
t/t4211/sha1/expect.multiple-superset | 7 +
t/t4211/sha1/expect.no-assertion-error | 12 +-
t/t4211/sha1/expect.parallel-change-f-to-main | 7 +
t/t4211/sha1/expect.simple-f | 4 +
t/t4211/sha1/expect.simple-f-to-main | 5 +
t/t4211/sha1/expect.simple-main | 11 +-
t/t4211/sha1/expect.simple-main-to-end | 11 +-
t/t4211/sha1/expect.two-ranges | 10 +-
t/t4211/sha1/expect.vanishes-early | 10 +-
t/t4211/sha256/expect.beginning-of-file | 4 +
t/t4211/sha256/expect.end-of-file | 11 +-
t/t4211/sha256/expect.move-support-f | 5 +
t/t4211/sha256/expect.multiple | 10 +-
t/t4211/sha256/expect.multiple-overlapping | 7 +
t/t4211/sha256/expect.multiple-superset | 7 +
t/t4211/sha256/expect.no-assertion-error | 12 +-
.../sha256/expect.parallel-change-f-to-main | 7 +
t/t4211/sha256/expect.simple-f | 4 +
t/t4211/sha256/expect.simple-f-to-main | 5 +
t/t4211/sha256/expect.simple-main | 11 +-
t/t4211/sha256/expect.simple-main-to-end | 11 +-
t/t4211/sha256/expect.two-ranges | 10 +-
t/t4211/sha256/expect.vanishes-early | 10 +-
35 files changed, 864 insertions(+), 217 deletions(-)
base-commit: 7b2bccb0d58d4f24705bf985de1f4612e4cf06e5
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2065%2Fmmontalbo%2Fspike-xdiff-line-range-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2065/mmontalbo/spike-xdiff-line-range-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2065
--
gitgitgadget
next reply other threads:[~2026-03-07 1:02 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-07 1:02 Michael Montalbo via GitGitGadget [this message]
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 ` [PATCH 0/4] line-log: route -L output through the standard diff pipeline Junio C Hamano
2026-03-07 1:37 ` 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
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=pull.2065.git.1772845338.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=mmontalbo@gmail.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox