diff --shortstat: do not count "unmerged" entries
Fix the same issue as the previous one for "git diff --stat"; unmerged entries was doubly-counted. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Nov 27, 2012 at 14:19 UTC
20c8cde45656fc187e06088ef5baf0bbdfdf70bd
1 file changed
+2
-3
diff.c
+2
-3
@@ -1701,9 +1701,8 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option
1701
int added = data->files[i]->added;
1702
int deleted= data->files[i]->deleted;
1703
1704
- if (data->files[i]->is_unmerged)
1705
- continue;
1706
- if (!data->files[i]->is_interesting && (added + deleted == 0)) {
1704
+ if (data->files[i]->is_unmerged ||
1705
+ (!data->files[i]->is_interesting && (added + deleted == 0))) {
1706
total_files--;
1707
} else if (!data->files[i]->is_binary) { /* don't count bytes */
1708
adds += added;