X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=fsck-cache.c;h=8e21bf1327a60840273973c08216c1387aac95b8;hb=9153368d1bc296b6dbd0c3606a04a7274c6edc7e;hp=32fa5d53e54f253720c165c6b3a5a6e1c4a44f9a;hpb=667bb59b2d5b0a2e7fca5970d6f757790a6edd74;p=git.git diff --git a/fsck-cache.c b/fsck-cache.c index 32fa5d53..8e21bf13 100644 --- a/fsck-cache.c +++ b/fsck-cache.c @@ -6,12 +6,16 @@ #include "tree.h" #include "blob.h" #include "tag.h" +#include "refs.h" +#include "pack.h" #define REACHABLE 0x0001 static int show_root = 0; static int show_tags = 0; static int show_unreachable = 0; +static int standalone = 0; +static int check_full = 0; static int keep_cache_objects = 0; static unsigned char head_sha1[20]; @@ -25,12 +29,17 @@ static void check_connectivity(void) struct object_list *refs; if (!obj->parsed) { - printf("missing %s %s\n", obj->type, sha1_to_hex(obj->sha1)); + if (!standalone && has_sha1_file(obj->sha1)) + ; /* it is in pack */ + else + printf("missing %s %s\n", + obj->type, sha1_to_hex(obj->sha1)); continue; } for (refs = obj->refs; refs; refs = refs->next) { - if (refs->item->parsed) + if (refs->item->parsed || + (!standalone && has_sha1_file(refs->item->sha1))) continue; printf("broken link from %7s %s\n", obj->type, sha1_to_hex(obj->sha1)); @@ -38,12 +47,9 @@ static void check_connectivity(void) refs->item->type, sha1_to_hex(refs->item->sha1)); } - /* Don't bother with tag reachability. */ - if (obj->type == tag_type) - continue; - if (show_unreachable && !(obj->flags & REACHABLE)) { - printf("unreachable %s %s\n", obj->type, sha1_to_hex(obj->sha1)); + printf("unreachable %s %s\n", + obj->type, sha1_to_hex(obj->sha1)); continue; } @@ -162,6 +168,8 @@ static int fsck_tree(struct tree *item) static int fsck_commit(struct commit *commit) { + free(commit->buffer); + commit->buffer = NULL; if (!commit->tree) return -1; if (!commit->parents && show_root) @@ -296,74 +304,74 @@ static int fsck_dir(int i, char *path) return 0; } -static void read_sha1_reference(const char *path) +static int default_refs = 0; + +static int fsck_handle_ref(const char *refname, const unsigned char *sha1) { - char hexname[60]; - unsigned char sha1[20]; - int fd = open(path, O_RDONLY), len; struct object *obj; - if (fd < 0) - return; - - len = read(fd, hexname, sizeof(hexname)); - close(fd); - if (len < 40) - return; - - if (get_sha1_hex(hexname, sha1) < 0) - return; - obj = lookup_object(sha1); + if (!obj) { + if (!standalone && has_sha1_file(sha1)) { + default_refs++; + return 0; /* it is in a pack */ + } + error("%s: invalid sha1 pointer %s", refname, sha1_to_hex(sha1)); + /* We'll continue with the rest despite the error.. */ + return 0; + } + default_refs++; obj->used = 1; mark_reachable(obj, REACHABLE); + return 0; } -static void find_file_objects(const char *base, const char *name) +static void get_default_heads(void) { - int baselen = strlen(base); - int namelen = strlen(name); - char *path = xmalloc(baselen + namelen + 2); - struct stat st; - - memcpy(path, base, baselen); - path[baselen] = '/'; - memcpy(path + baselen + 1, name, namelen+1); - if (stat(path, &st) < 0) - return; + for_each_ref(fsck_handle_ref); + if (!default_refs) + die("No default references"); +} - /* - * Recurse into directories - */ - if (S_ISDIR(st.st_mode)) { - DIR *dir = opendir(path); - if (dir) { - struct dirent *de; - while ((de = readdir(dir)) != NULL) { - if (de->d_name[0] == '.') - continue; - find_file_objects(path, de->d_name); - } - closedir(dir); - } - return; - } - if (S_ISREG(st.st_mode)) { - read_sha1_reference(path); - return; +static void fsck_object_dir(const char *path) +{ + int i; + for (i = 0; i < 256; i++) { + static char dir[4096]; + sprintf(dir, "%s/%02x", path, i); + fsck_dir(i, dir); } + fsck_sha1_list(); } -static void get_default_heads(void) +static int fsck_head_link(void) { - char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT; - find_file_objects(git_dir, "refs"); + int fd, count; + char hex[40]; + unsigned char sha1[20]; + static char path[PATH_MAX], link[PATH_MAX]; + const char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT; + + snprintf(path, sizeof(path), "%s/HEAD", git_dir); + if (readlink(path, link, sizeof(link)) < 0) + return error("HEAD is not a symlink"); + if (strncmp("refs/heads/", link, 11)) + return error("HEAD points to something strange (%s)", link); + fd = open(path, O_RDONLY); + if (fd < 0) + return error("HEAD: %s", strerror(errno)); + count = read(fd, hex, sizeof(hex)); + close(fd); + if (count < 0) + return error("HEAD: %s", strerror(errno)); + if (count < 40 || get_sha1_hex(hex, sha1)) + return error("HEAD: not a valid git pointer"); + return 0; } int main(int argc, char **argv) { int i, heads; - char *sha1_dir; for (i = 1; i < argc; i++) { const char *arg = argv[i]; @@ -384,17 +392,52 @@ int main(int argc, char **argv) keep_cache_objects = 1; continue; } + if (!strcmp(arg, "--standalone")) { + standalone = 1; + continue; + } + if (!strcmp(arg, "--full")) { + check_full = 1; + continue; + } if (*arg == '-') - usage("git-fsck-cache [--tags] [[--unreachable] [--cache] *]"); + usage("git-fsck-cache [--tags] [[--unreachable] [--cache] [--standalone | --full] *]"); } - sha1_dir = get_object_directory(); - for (i = 0; i < 256; i++) { - static char dir[4096]; - sprintf(dir, "%s/%02x", sha1_dir, i); - fsck_dir(i, dir); + if (standalone && check_full) + die("Only one of --standalone or --full can be used."); + if (standalone) + unsetenv("GIT_ALTERNATE_OBJECT_DIRECTORIES"); + + fsck_head_link(); + fsck_object_dir(get_object_directory()); + if (check_full) { + int j; + struct packed_git *p; + prepare_alt_odb(); + for (j = 0; alt_odb[j].base; j++) { + char namebuf[PATH_MAX]; + int namelen = alt_odb[j].name - alt_odb[j].base; + memcpy(namebuf, alt_odb[j].base, namelen); + namebuf[namelen - 1] = 0; + fsck_object_dir(namebuf); + } + prepare_packed_git(); + for (p = packed_git; p; p = p->next) + /* verify gives error messages itself */ + verify_pack(p, 0); + + for (p = packed_git; p; p = p->next) { + int num = num_packed_objects(p); + for (i = 0; i < num; i++) { + unsigned char sha1[20]; + nth_packed_object_sha1(p, i, sha1); + if (fsck_sha1(sha1) < 0) + fprintf(stderr, "bad sha1 entry '%s'\n", sha1_to_hex(sha1)); + + } + } } - fsck_sha1_list(); heads = 0; for (i = 1; i < argc; i++) { @@ -419,7 +462,7 @@ int main(int argc, char **argv) } /* - * If we've not been gived any explicit head information, do the + * If we've not been given any explicit head information, do the * default ones from .git/refs. We also consider the index file * in this case (ie this implies --cache). */