Asking for stat (either with --stat or --patch-with-stat) gives
you diffstat for the first parent, even under combine-diff.
While the combined patch is useful to highlight the complexity
and interaction of the parts touched by all branches when
reviewing a merge commit, diffstat is a tool to assess the
extent of damage the merge brings in, and showing stat with the
first parent is more sensible than clever per-parent diffstat.
Signed-off-by: Junio C Hamano <junkio@cox.net>
case DIFF_FORMAT_NAME:
show_raw_diff(p, num_parent, rev);
return;
case DIFF_FORMAT_NAME:
show_raw_diff(p, num_parent, rev);
return;
case DIFF_FORMAT_PATCH:
show_patch_diff(p, num_parent, dense, rev);
case DIFF_FORMAT_PATCH:
show_patch_diff(p, num_parent, dense, rev);
+ return;
+ default:
+ return;
struct commit_list *parents;
struct combine_diff_path *p, *paths = NULL;
int num_parent, i, num_paths;
struct commit_list *parents;
struct combine_diff_path *p, *paths = NULL;
int num_parent, i, num_paths;
+ do_diffstat = (opt->output_format == DIFF_FORMAT_DIFFSTAT ||
+ opt->with_stat);
- diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
+ diffopts.with_stat = 0;
diffopts.recursive = 1;
/* count parents */
diffopts.recursive = 1;
/* count parents */
parents;
parents = parents->next, i++) {
struct commit *parent = parents->item;
parents;
parents = parents->next, i++) {
struct commit *parent = parents->item;
+ /* show stat against the first parent even
+ * when doing combined diff.
+ */
+ if (i == 0 && do_diffstat)
+ diffopts.output_format = DIFF_FORMAT_DIFFSTAT;
+ else
+ diffopts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_tree_sha1(parent->object.sha1, commit->object.sha1, "",
&diffopts);
diffcore_std(&diffopts);
paths = intersect_paths(paths, i, num_parent);
diff_tree_sha1(parent->object.sha1, commit->object.sha1, "",
&diffopts);
diffcore_std(&diffopts);
paths = intersect_paths(paths, i, num_parent);
- if (diffopts.with_stat && rev->loginfo)
- show_log(rev, rev->loginfo, "---\n");
+ if (do_diffstat && rev->loginfo)
+ show_log(rev, rev->loginfo,
+ opt->with_stat ? "---\n" : "\n");
+ if (opt->with_stat)
+ putchar('\n');
}
/* find out surviving paths */
}
/* find out surviving paths */