From 14d900dca83e287c13f581a38e503f37475e679b Mon Sep 17 00:00:00 2001 From: Michael Montalbo Date: Wed, 4 Mar 2026 14:09:45 -0800 Subject: [PATCH 1/2] line-log: fix crash when combined with pickaxe options queue_diffs() passes the caller's diff_options, which may carry user-specified pickaxe state, to diff_tree_oid() and diffcore_std() when detecting renames for line-level history tracking. When pickaxe options are present on the command line (-G and -S to filter by text pattern, --find-object to filter by object identity), diffcore_std() also runs diffcore_pickaxe(), which may discard diff pairs that are relevant for rename detection. Losing those pairs breaks rename following. Before a2bb801f6a (line-log: avoid unnecessary full tree diffs, 2019-08-21), this silently truncated history at rename boundaries. That commit moved filter_diffs_for_paths() inside the rename- detection block, so it only runs when diff_might_be_rename() returns true. When pickaxe discards a rename pair, the rename goes undetected, and a deletion pair at a subsequent commit passes through uncleaned, reaching process_diff_filepair() with an invalid filespec and triggering an assertion failure. Fix this by building a private diff_options for the rename-detection path inside queue_diffs(), following the same pattern used by blame's find_rename(). This isolates the rename machinery from unrelated user-specified options. Note that this only fixes the crash. The -G, -S, and --find-object options still have no effect on -L output because line-log uses its own commit-filtering logic that bypasses the normal pickaxe pipeline. Add tests that verify the crash is fixed and mark the silent-ignore behavior as known breakage for all three options. Reported-by: Matthew Hughes Signed-off-by: Michael Montalbo --- line-log.c | 22 ++++++++++++++++---- t/t4211-line-log.sh | 49 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/line-log.c b/line-log.c index 8bd422148dd492..d7d7ddb6af05f8 100644 --- a/line-log.c +++ b/line-log.c @@ -858,15 +858,29 @@ static void queue_diffs(struct line_log_data *range, diff_queue_clear(&diff_queued_diff); diff_tree_oid(parent_tree_oid, tree_oid, "", opt); if (opt->detect_rename && diff_might_be_rename()) { + struct diff_options rename_opts; + + /* + * Build a private diff_options for rename detection so + * that any user-specified options on the original opts + * (e.g. pickaxe) cannot discard diff pairs needed for + * rename tracking. Similar to blame's find_rename(). + */ + repo_diff_setup(opt->repo, &rename_opts); + rename_opts.flags.recursive = 1; + rename_opts.detect_rename = opt->detect_rename; + rename_opts.rename_score = opt->rename_score; + rename_opts.output_format = DIFF_FORMAT_NO_OUTPUT; + diff_setup_done(&rename_opts); + /* must look at the full tree diff to detect renames */ - clear_pathspec(&opt->pathspec); diff_queue_clear(&diff_queued_diff); - - diff_tree_oid(parent_tree_oid, tree_oid, "", opt); + diff_tree_oid(parent_tree_oid, tree_oid, "", &rename_opts); filter_diffs_for_paths(range, 1); - diffcore_std(opt); + diffcore_std(&rename_opts); filter_diffs_for_paths(range, 0); + diff_free(&rename_opts); } move_diff_queue(queue, &diff_queued_diff); } diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 0a7c3ca42f80fa..7acc38f72da348 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -367,4 +367,53 @@ test_expect_success 'show line-log with graph' ' test_cmp expect actual ' +test_expect_success 'setup for -L with -G/-S/--find-object and a merge with rename' ' + git checkout --orphan pickaxe-rename && + git reset --hard && + + echo content >file && + git add file && + git commit -m "add file" && + + git checkout -b pickaxe-rename-side && + git mv file renamed-file && + git commit -m "rename file" && + + git checkout pickaxe-rename && + git commit --allow-empty -m "diverge" && + git merge --no-edit pickaxe-rename-side && + + git mv renamed-file file && + git commit -m "rename back" +' + +test_expect_success '-L -G does not crash with merge and rename' ' + git log --format="%s" --no-patch -L 1,1:file -G "." >actual +' + +test_expect_success '-L -S does not crash with merge and rename' ' + git log --format="%s" --no-patch -L 1,1:file -S content >actual +' + +test_expect_success '-L --find-object does not crash with merge and rename' ' + git log --format="%s" --no-patch -L 1,1:file \ + --find-object=$(git rev-parse HEAD:file) >actual +' + +test_expect_failure '-L -G should filter commits by pattern' ' + git log --format="%s" --no-patch -L 1,1:file -G "nomatch" >actual && + test_must_be_empty actual +' + +test_expect_failure '-L -S should filter commits by pattern' ' + git log --format="%s" --no-patch -L 1,1:file -S "nomatch" >actual && + test_must_be_empty actual +' + +test_expect_failure '-L --find-object should filter commits by object' ' + git log --format="%s" --no-patch -L 1,1:file \ + --find-object=$ZERO_OID >actual && + test_must_be_empty actual +' + test_done From ff29a404199e9d85c2b091b5c7396652b3eca129 Mon Sep 17 00:00:00 2001 From: Michael Montalbo Date: Wed, 4 Mar 2026 14:10:00 -0800 Subject: [PATCH 2/2] log: reject pickaxe options when combined with -L The previous commit fixed a crash when -G, -S, or --find-object was used together with -L and rename detection. However, these options still have no effect on -L output: line-log uses its own commit-filtering logic in line_log_filter() and never consults the pickaxe machinery. Rather than silently ignoring these options, reject the combination with a clear error message. This replaces the known-breakage tests from the previous commit with tests that verify the rejection for all three options. A future series could teach line-log to honor these options and remove this restriction. Signed-off-by: Michael Montalbo --- builtin/log.c | 4 ++++ t/t4211-line-log.sh | 52 ++++++++------------------------------------- 2 files changed, 13 insertions(+), 43 deletions(-) diff --git a/builtin/log.c b/builtin/log.c index 5c9a8ef3632906..44e2399d596fe8 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -317,6 +317,10 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, if (rev->line_level_traverse && rev->prune_data.nr) die(_("-L: cannot be used with pathspec")); + if (rev->line_level_traverse && + (rev->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)) + die(_("-L does not yet support -G, -S, or --find-object")); + memset(&w, 0, sizeof(w)); userformat_find_requirements(NULL, &w); diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh index 7acc38f72da348..8ebc73d2d96c0c 100755 --- a/t/t4211-line-log.sh +++ b/t/t4211-line-log.sh @@ -367,53 +367,19 @@ test_expect_success 'show line-log with graph' ' test_cmp expect actual ' -test_expect_success 'setup for -L with -G/-S/--find-object and a merge with rename' ' - git checkout --orphan pickaxe-rename && - git reset --hard && - - echo content >file && - git add file && - git commit -m "add file" && - - git checkout -b pickaxe-rename-side && - git mv file renamed-file && - git commit -m "rename file" && - - git checkout pickaxe-rename && - git commit --allow-empty -m "diverge" && - git merge --no-edit pickaxe-rename-side && - - git mv renamed-file file && - git commit -m "rename back" -' - -test_expect_success '-L -G does not crash with merge and rename' ' - git log --format="%s" --no-patch -L 1,1:file -G "." >actual -' - -test_expect_success '-L -S does not crash with merge and rename' ' - git log --format="%s" --no-patch -L 1,1:file -S content >actual -' - -test_expect_success '-L --find-object does not crash with merge and rename' ' - git log --format="%s" --no-patch -L 1,1:file \ - --find-object=$(git rev-parse HEAD:file) >actual -' - -test_expect_failure '-L -G should filter commits by pattern' ' - git log --format="%s" --no-patch -L 1,1:file -G "nomatch" >actual && - test_must_be_empty actual +test_expect_success '-L with -G is rejected' ' + test_must_fail git log -L 1,1:a.c -G "pattern" 2>err && + test_grep "does not yet support" err ' -test_expect_failure '-L -S should filter commits by pattern' ' - git log --format="%s" --no-patch -L 1,1:file -S "nomatch" >actual && - test_must_be_empty actual +test_expect_success '-L with -S is rejected' ' + test_must_fail git log -L 1,1:a.c -S "pattern" 2>err && + test_grep "does not yet support" err ' -test_expect_failure '-L --find-object should filter commits by object' ' - git log --format="%s" --no-patch -L 1,1:file \ - --find-object=$ZERO_OID >actual && - test_must_be_empty actual +test_expect_success '-L with --find-object is rejected' ' + test_must_fail git log -L 1,1:a.c --find-object=HEAD 2>err && + test_grep "does not yet support" err ' test_done