diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-09-18 10:07:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-18 10:07:02 -0700 |
| commit | 7b776bc308f904850f36a82e19f9775e672d464c (patch) | |
| tree | 90f0638597e3c9be9360f3b35f5ac986dd9e7fa2 /log-tree.c | |
| parent | Merge branch 'ne/alloc-free-and-null' (diff) | |
| parent | range-diff: add configurable memory limit for cost matrix (diff) | |
| download | git-7b776bc308f904850f36a82e19f9775e672d464c.tar.gz git-7b776bc308f904850f36a82e19f9775e672d464c.zip | |
Merge branch 'pc/range-diff-memory-limit'
"git range-diff" learned a way to limit the memory consumed by
O(N*N) cost matrix.
* pc/range-diff-memory-limit:
range-diff: add configurable memory limit for cost matrix
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/log-tree.c b/log-tree.c index 233bf9f227..73d21f7176 100644 --- a/log-tree.c +++ b/log-tree.c @@ -717,6 +717,7 @@ static void show_diff_of_diff(struct rev_info *opt) struct range_diff_options range_diff_opts = { .creation_factor = opt->creation_factor, .dual_color = 1, + .max_memory = RANGE_DIFF_MAX_MEMORY_DEFAULT, .diffopt = &opts }; |