From 95bedc9eecfa4d905a9d85dff8b406049476d9e7 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Tue, 31 May 2005 20:50:49 -0700
Subject: git-apply --stat: limit lines to 79 characters

It had already tried to do that, but with the independent
rounding of the number of '+' and '-' characters, it would
sometimes do 80-char lines after all.

diff --git a/apply.c b/apply.c
index dba8292..e0a1549 100644
--- a/apply.c
+++ b/apply.c
@@ -699,7 +699,7 @@ const char minuses[]= "---------------------------------------------------------
 static void show_stats(struct patch *patch)
 {
 	char *name = patch->old_name;
-	int len, max, add, del;
+	int len, max, add, del, total;
 
 	if (!name)
 		name = patch->new_name;
@@ -721,9 +721,14 @@ static void show_stats(struct patch *patch)
 	max = max_change;
 	if (max + len > 70)
 		max = 70 - len;
-	
-	add = (patch->lines_added * max + max_change/2) / max_change;
-	del = (patch->lines_deleted * max + max_change/2) / max_change;
+
+	add = patch->lines_added;
+	del = patch->lines_deleted;
+	total = add + del;
+
+	total = (total * max + max_change / 2) / max_change;
+	add = (add * max + max_change / 2) / max_change;
+	del = total - add;
 	printf(" %-*s |%5d %.*s%.*s\n",
 		len, name, patch->lines_added + patch->lines_deleted,
 		add, pluses, del, minuses);
-- 
cgit v0.10.2-6-g49f6