From: Junio C Hamano <junkio@cox.net>
Date: Fri, 10 Jun 2005 08:32:37 +0000 (-0700)
Subject: [PATCH] Bugfix: read-cache.c:write_cache() misrecords number of entries.
X-Git-Tag: v0.99~294
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=025a0709b6179506ffc0d35967bdd4fb804d30fb;p=git.git

[PATCH] Bugfix: read-cache.c:write_cache() misrecords number of entries.

When we choose to omit deleted entries, we should subtract
numbers of such entries from the total number in the header.

Signed-off-by: Junio C Hamano <junkio@cox.net>

Oops.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/read-cache.c b/read-cache.c
index d358933b..e9618f09 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -440,11 +440,15 @@ int write_cache(int newfd, struct cache_entry **cache, int entries)
 {
 	SHA_CTX c;
 	struct cache_header hdr;
-	int i;
+	int i, removed;
+
+	for (i = removed = 0; i < entries; i++)
+		if (!cache[i]->ce_mode)
+			removed++;
 
 	hdr.hdr_signature = htonl(CACHE_SIGNATURE);
 	hdr.hdr_version = htonl(2);
-	hdr.hdr_entries = htonl(entries);
+	hdr.hdr_entries = htonl(entries - removed);
 
 	SHA1_Init(&c);
 	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)