From: Kevin Bracey <kevin@bracey.fi>
Date: Thu, 16 May 2013 15:32:27 +0000 (+0300)
Subject: decorate.c: compact table when growing
X-Git-Tag: v1.8.4-rc0~171^2~14
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/83f0412f3fff3b4108e7f05c30f3e861d148f5f2

decorate.c: compact table when growing

When growing the table, take the opportunity to "compact" it by removing
entries with NULL decoration.

Users may have "removed" decorations by passing NULL to
insert_decoration. An object's table entry can't actually be removed
during normal operation, as it would break the linear hash collision
search. But we can remove NULL decoration entries when rebuilding the
table.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/decorate.c b/decorate.c
index 2f8a63e388..7cb5d29a89 100644
--- a/decorate.c
+++ b/decorate.c
@@ -49,7 +49,7 @@ static void grow_decoration(struct decoration *n)
 		const struct object *base = old_hash[i].base;
 		void *decoration = old_hash[i].decoration;
 
-		if (!base)
+		if (!decoration)
 			continue;
 		insert_decoration(n, base, decoration);
 	}