combine-diff: treat --shortstat like --stat

diff --git a/combine-diff.c b/combine-diff.c
index ebf9064e27be71688cc5d446f29aefabf65b4529..b4a92a8505c6a808255bc1319b17f4d3c724faa2 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1325,6 +1325,7 @@ static const char *path_path(void *obj)
  * Diff stat formats which we always compute solely against the first parent.
  */
 #define STAT_FORMAT_MASK (DIFF_FORMAT_NUMSTAT \
+                         | DIFF_FORMAT_SHORTSTAT \
                          | DIFF_FORMAT_DIFFSTAT)
 
 /* find set of paths that every parent touches */