From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 27 Nov 2012 22:19:36 +0000 (-0800)
Subject: diff --shortstat: do not count "unmerged" entries
X-Git-Tag: v1.8.1-rc0~4^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=20c8cde45656fc187e06088ef5baf0bbdfdf70bd;p=thirdparty%2Fgit.git

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>
---

diff --git a/diff.c b/diff.c
index 26ede82a7b..374b2354f3 100644
--- a/diff.c
+++ b/diff.c
@@ -1701,9 +1701,8 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option
 		int added = data->files[i]->added;
 		int deleted= data->files[i]->deleted;
 
-		if (data->files[i]->is_unmerged)
-			continue;
-		if (!data->files[i]->is_interesting && (added + deleted == 0)) {
+		if (data->files[i]->is_unmerged ||
+		    (!data->files[i]->is_interesting && (added + deleted == 0))) {
 			total_files--;
 		} else if (!data->files[i]->is_binary) { /* don't count bytes */
 			adds += added;