diff --git a/fsck-cache.c b/fsck-cache.c
index 81fd25a10050fd60d6f901191c9cc9e5cdb4f3d6..edaf9e46000197de66b2afb98a01358375b92e37 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
#include <sys/types.h>
#include <dirent.h>
#include <sys/types.h>
#include <dirent.h>
-/*
- * These three functions should build up a graph in memory about
- * what objects we've referenced, and found, and types..
- *
- * Right now we don't do that kind of reachability checking. Yet.
- */
-static void fsck_tree(void *data, unsigned long size)
+#include "commit.h"
+#include "tree.h"
+#include "blob.h"
+
+#define REACHABLE 0x0001
+
+static int show_unreachable = 0;
+static unsigned char head_sha1[20];
+
+static void check_connectivity(void)
{
{
+ int i;
+
+ /* Look up all the requirements, warn about missing objects.. */
+ for (i = 0; i < nr_objs; i++) {
+ struct object *obj = objs[i];
+
+ if (show_unreachable && !(obj->flags & REACHABLE)) {
+ printf("unreachable %s\n", sha1_to_hex(obj->sha1));
+ continue;
+ }
+
+ if (!obj->parsed) {
+ printf("missing %s %s\n", obj->type,
+ sha1_to_hex(obj->sha1));
+ }
+ if (!obj->used) {
+ printf("dangling %s %s\n", obj->type,
+ sha1_to_hex(obj->sha1));
+ }
+ }
}
}
-static void fsck_commit(void *data, unsigned long size)
+static int fsck_tree(unsigned char *sha1, void *data, unsigned long size)
{
{
+ struct tree *item = lookup_tree(sha1);
+ if (parse_tree(item))
+ return -1;
+ if (item->has_full_path) {
+ fprintf(stderr, "warning: fsck-cache: tree %s "
+ "has full pathnames in it\n", sha1_to_hex(sha1));
+ }
+ return 0;
}
}
-static int mark_sha1_seen(unsigned char *sha1, char *tag)
+static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
{
{
+ struct commit *commit = lookup_commit(sha1);
+ if (parse_commit(commit))
+ return -1;
+ if (!commit->tree)
+ return -1;
+ if (!commit->parents)
+ printf("root %s\n", sha1_to_hex(sha1));
return 0;
}
return 0;
}
-static int fsck_entry(unsigned char *sha1, char *tag, void *data, unsigned long size)
+static int fsck_entry(unsigned char *sha1, char *tag, void *data,
+ unsigned long size)
{
{
- if (!strcmp(tag, "blob"))
- /* Nothing to check */;
- else if (!strcmp(tag, "tree"))
- fsck_tree(data, size);
- else if (!strcmp(tag, "commit"))
- fsck_commit(data, size);
- else
+ if (!strcmp(tag, "blob")) {
+ lookup_blob(sha1); /* Nothing to check; but notice it. */
+ } else if (!strcmp(tag, "tree")) {
+ if (fsck_tree(sha1, data, size) < 0)
+ return -1;
+ } else if (!strcmp(tag, "commit")) {
+ if (fsck_commit(sha1, data, size) < 0)
+ return -1;
+ } else
return -1;
return -1;
- return mark_sha1_seen(sha1, tag);
+ return 0;
}
static int fsck_name(char *hex)
}
static int fsck_name(char *hex)
unsigned long size;
void *buffer = NULL;
if (!check_sha1_signature(sha1, map, mapsize))
unsigned long size;
void *buffer = NULL;
if (!check_sha1_signature(sha1, map, mapsize))
- buffer = unpack_sha1_file(map, mapsize, type, &size);
+ buffer = unpack_sha1_file(map, mapsize, type,
+ &size);
munmap(map, mapsize);
if (buffer && !fsck_entry(sha1, type, buffer, size))
return 0;
munmap(map, mapsize);
if (buffer && !fsck_entry(sha1, type, buffer, size))
return 0;
struct dirent *de;
if (!dir) {
struct dirent *de;
if (!dir) {
- fprintf(stderr, "missing sha1 directory '%s'", path);
- return -1;
+ return error("missing sha1 directory '%s'", path);
}
while ((de = readdir(dir)) != NULL) {
}
while ((de = readdir(dir)) != NULL) {
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- int i;
+ int i, heads;
char *sha1_dir;
char *sha1_dir;
- if (argc != 1)
- usage("fsck-cache");
sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
for (i = 0; i < 256; i++) {
static char dir[4096];
sprintf(dir, "%s/%02x", sha1_dir, i);
fsck_dir(i, dir);
}
sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
for (i = 0; i < 256; i++) {
static char dir[4096];
sprintf(dir, "%s/%02x", sha1_dir, i);
fsck_dir(i, dir);
}
+
+ heads = 0;
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "--unreachable")) {
+ show_unreachable = 1;
+ continue;
+ }
+ if (!get_sha1_hex(argv[i], head_sha1)) {
+ struct object *obj = &lookup_commit(head_sha1)->object;
+ obj->used = 1;
+ mark_reachable(obj, REACHABLE);
+ heads++;
+ continue;
+ }
+ error("fsck-cache [[--unreachable] <head-sha1>*]");
+ }
+
+ if (!heads) {
+ if (show_unreachable) {
+ fprintf(stderr, "unable to do reachability without a head\n");
+ show_unreachable = 0;
+ }
+ fprintf(stderr, "expect dangling commits - potential heads - due to lack of head information\n");
+ }
+
+ check_connectivity();
return 0;
}
return 0;
}