[PATCH 2/2] diff-lib: skip paths outside prefix in oneway_diff()
- From
Jeff King <peff@peff.net>
- Date
- Jul 26, 2026, 08:47 UTC
- Message-ID
- <20260726084705.GB3529698@coredump.intra.peff.net>
- In-Reply-To
- <20260726084550.GC2366012@coredump.intra.peff.net>
Commit 8174627b3d (diff-lib: ignore paths that are outside $cwd if --relative asked, 2021-08-22) taught run_diff_files() to skip entries outside the requested prefix before processing them.
Do the same in oneway_diff(), which handles the diff-index code path. The lower-level diff queue functions already reject such paths, but checking here avoids unnecessary work and keeps them out of every do_oneway_diff() code path.
Signed-off-by: Jeff King <peff@peff.net> --- diff-lib.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/diff-lib.c b/diff-lib.c index 95f920a9a0..9986f5b141 100644 --- a/diff-lib.c +++ b/diff-lib.c @@ -528,6 +528,11 @@ static int oneway_diff(const struct cache_entry * const *src, if (tree == o->df_conflict_entry) tree = NULL; + if (revs->diffopt.prefix && + strncmp((idx ? idx : tree)->name, revs->diffopt.prefix, + revs->diffopt.prefix_length)) + return 0; + if (ce_path_match(revs->diffopt.repo->index, idx ? idx : tree, &revs->prune_data, NULL)) {
-- 2.55.0.742.gf2bff09aa6