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

diff-merges: introduce revs->first_parent_merges flag 

This new field allows us to separate format of diff for merges from
'first_parent_only' flag which primary purpose is limiting history
traversal.

This change further localizes diff format selection logic into the
diff-merges.c file.

Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Sergey Organov 2020-12-21 18:19:40 +03:00 committed by Junio C Hamano
parent 3b6c17b5c0
commit 3291eea310
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
diff-merges.c
View File

@ -73,6 +73,8 @@ void diff_merges_default_to_first_parent(struct rev_info *revs)
{ {
if (revs->ignore_merges < 0) /* No -m */ if (revs->ignore_merges < 0) /* No -m */
revs->ignore_merges = 0; revs->ignore_merges = 0;
if (!revs->combine_merges) /* No -c/--cc" */
revs->first_parent_merges = 1;
} }


void diff_merges_default_to_dense_combined(struct rev_info *revs) void diff_merges_default_to_dense_combined(struct rev_info *revs)

4
log-tree.c
View File

@ -922,7 +922,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
return 0; return 0;
else if (opt->combine_merges) else if (opt->combine_merges)
return do_diff_combined(opt, commit); return do_diff_combined(opt, commit);
else if (!opt->first_parent_only) { else if (!opt->first_parent_merges) {
/* If we show multiple diffs, show the parent info */ /* If we show multiple diffs, show the parent info */
log->parent = parents->item; log->parent = parents->item;
} }
@ -941,7 +941,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log


/* Set up the log info for the next parent, if any.. */ /* Set up the log info for the next parent, if any.. */
parents = parents->next; parents = parents->next;
if (!parents || opt->first_parent_only) if (!parents || opt->first_parent_merges)
break; break;
log->parent = parents->item; log->parent = parents->item;
opt->loginfo = log; opt->loginfo = log;

1
revision.h
View File

@ -194,6 +194,7 @@ struct rev_info {
combine_merges:1, combine_merges:1,
combined_all_paths:1, combined_all_paths:1,
dense_combined_merges:1, dense_combined_merges:1,
first_parent_merges:1,
always_show_header:1; always_show_header:1;
int ignore_merges:2; int ignore_merges:2;