undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'so/log-tree-diff-cleanup'

Browse Source 
Code cleanup.

* so/log-tree-diff-cleanup:
  log_tree_diff: get rid of extra check for NULL
  log_tree_diff: get rid of code duplication for first_parent_only
This commit is contained in:
Junio C Hamano 2020-09-18 17:58:00 -07:00
commit e46544454a
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
log-tree.c
View File

@ -917,27 +917,16 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
} }
/* More than one parent? */ /* More than one parent? */
if (parents && parents->next) { if (parents->next) {
if (opt->ignore_merges) if (opt->ignore_merges)
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_only) {
/* /* If we show multiple diffs, show the parent info */
* Generate merge log entry only for the first
* parent, showing summary diff of the others
* we merged _in_.
*/
parse_commit_or_die(parents->item);
diff_tree_oid(get_commit_tree_oid(parents->item),
oid, "", &opt->diffopt);
log_tree_diff_flush(opt);
return !opt->loginfo;
}
/* If we show individual diffs, show the parent info */
log->parent = parents->item; log->parent = parents->item;
} }
}
showed_log = 0; showed_log = 0;
for (;;) { for (;;) {
@ -952,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) if (!parents || opt->first_parent_only)
break; break;
log->parent = parents->item; log->parent = parents->item;
opt->loginfo = log; opt->loginfo = log;