diff options
| author | Jeff King <peff@peff.net> | 2019-01-24 12:36:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-24 20:18:53 (GMT) |
| commit | dac03b5518a053e52ed7ee20925970728d3ae4c3 (patch) | |
| tree | fdafb212f5589a240346ce29fa29a1b2383e9726 /combine-diff.c | |
| parent | 04b19fcafd734245e61fd1c090cd7de8c2993eaa (diff) | |
| download | git-dac03b5518a053e52ed7ee20925970728d3ae4c3.zip git-dac03b5518a053e52ed7ee20925970728d3ae4c3.tar.gz git-dac03b5518a053e52ed7ee20925970728d3ae4c3.tar.bz2 | |
combine-diff: treat --dirstat like --stat
Currently "--cc --dirstat" will show nothing for a merge. Like
--shortstat and --summary in the previous two patches, it probably makes
sense to treat it like we do --stat, and show a stat against the
first-parent.
This case is less obviously correct than for --shortstat and --summary,
as those are basically variants of --stat themselves. It's possible we
could develop a multi-parent combined dirstat format, in which case we
might regret defining this first-parent behavior. But the same could be
said for --stat, and in the 12+ years of it showing first-parent stats,
nobody has complained.
So showing the first-parent dirstat is at least _useful_, and if we
later develop a clever multi-parent stat format, we'd probably have to
deal with --stat anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/combine-diff.c b/combine-diff.c index ea79830..dc9d986 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1327,6 +1327,7 @@ static const char *path_path(void *obj) #define STAT_FORMAT_MASK (DIFF_FORMAT_NUMSTAT \ | DIFF_FORMAT_SHORTSTAT \ | DIFF_FORMAT_SUMMARY \ + | DIFF_FORMAT_DIRSTAT \ | DIFF_FORMAT_DIFFSTAT) /* find set of paths that every parent touches */ |