From: Junio C Hamano <junkio@cox.net>
Date: Tue, 25 Apr 2006 23:37:08 +0000 (-0700)
Subject: Teach fsck-objects about cache-tree.
X-Git-Tag: v1.4.0-rc1~45^2~19
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=53dc3f3e8069283924fcb7f1d538e2d1b03ec3bb;p=git.git

Teach fsck-objects about cache-tree.

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

diff --git a/fsck-objects.c b/fsck-objects.c
index 59b25904..cc09143a 100644
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -8,6 +8,7 @@
 #include "tag.h"
 #include "refs.h"
 #include "pack.h"
+#include "cache-tree.h"
 
 #define REACHABLE 0x0001
 
@@ -438,6 +439,21 @@ static int fsck_head_link(void)
 	return 0;
 }
 
+static int fsck_cache_tree(struct cache_tree *it)
+{
+	int i;
+	int err = 0;
+
+	if (0 <= it->entry_count) {
+		struct object *obj = parse_object(it->sha1);
+		if (obj->type != tree_type)
+			err |= objerror(obj, "non-tree in cache-tree");
+	}
+	for (i = 0; i < it->subtree_nr; i++)
+		err |= fsck_cache_tree(it->down[i]->cache_tree);
+	return err;
+}
+
 int main(int argc, char **argv)
 {
 	int i, heads;
@@ -547,6 +563,8 @@ int main(int argc, char **argv)
 			obj->used = 1;
 			mark_reachable(obj, REACHABLE);
 		}
+		if (active_cache_tree)
+			fsck_cache_tree(active_cache_tree);
 	}
 
 	check_connectivity();