kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

line-log: get rid of the parents array in process_ranges_merge_commit() 

We can easily iterate through the parents of a merge commit without
turning the list of parents into a dynamically allocated array of
parents, so let's do so.  This way we can avoid a memory allocation
for each processed merge commit, though its effect on runtime seems to
be unmeasurable.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
SZEDER Gábor 2025-08-24 21:06:42 +02:00 committed by Junio C Hamano
parent a3540ed20e
commit 9df27c258e
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
line-log.c
View File

@ -1203,7 +1203,6 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
struct line_log_data *range) struct line_log_data *range)
{ {
struct line_log_data **cand; struct line_log_data **cand;
struct commit **parents;
struct commit_list *p; struct commit_list *p;
int i; int i;
int nparents = commit_list_count(commit->parents); int nparents = commit_list_count(commit->parents);
@ -1213,15 +1212,15 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
nparents = 1; nparents = 1;


CALLOC_ARRAY(cand, nparents); CALLOC_ARRAY(cand, nparents);
ALLOC_ARRAY(parents, nparents);


p = commit->parents; for (p = commit->parents, i = 0;
for (i = 0; i < nparents; i++) { p && i < nparents;
p = p->next, i++) {
struct commit *parent = p->item;
struct diff_queue_struct diffqueue = DIFF_QUEUE_INIT; struct diff_queue_struct diffqueue = DIFF_QUEUE_INIT;
int changed; int changed;
parents[i] = p->item;
p = p->next; queue_diffs(range, &rev->diffopt, &diffqueue, commit, parent);
queue_diffs(range, &rev->diffopt, &diffqueue, commit, parents[i]);


changed = process_all_files(&cand[i], rev, &diffqueue, range); changed = process_all_files(&cand[i], rev, &diffqueue, range);
diff_queue_clear(&diffqueue); diff_queue_clear(&diffqueue);
@ -1230,9 +1229,9 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
* This parent can take all the blame, so we * This parent can take all the blame, so we
* don't follow any other path in history * don't follow any other path in history
*/ */
add_line_range(rev, parents[i], cand[i]); add_line_range(rev, parent, cand[i]);
free_commit_list(commit->parents); free_commit_list(commit->parents);
commit_list_append(parents[i], &commit->parents); commit_list_append(parent, &commit->parents);


ret = 0; ret = 0;
goto out; goto out;
@ -1243,14 +1242,15 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
* No single parent took the blame. We add the candidates * No single parent took the blame. We add the candidates
* from the above loop to the parents. * from the above loop to the parents.
*/ */
for (i = 0; i < nparents; i++) for (p = commit->parents, i = 0;
add_line_range(rev, parents[i], cand[i]); p && i < nparents;
p = p->next, i++)
add_line_range(rev, p->item, cand[i]);


ret = 1; ret = 1;


out: out:
clear_commit_line_range(rev, commit); clear_commit_line_range(rev, commit);
free(parents);
for (i = 0; i < nparents; i++) { for (i = 0; i < nparents; i++) {
if (!cand[i]) if (!cand[i])
continue; continue;