#include "tree.h"
#include "blob.h"
#include "tag.h"
+#include "refs.h"
+#include "pack.h"
#define REACHABLE 0x0001
static int show_unreachable = 0;
static int standalone = 0;
static int check_full = 0;
+static int check_strict = 0;
static int keep_cache_objects = 0;
static unsigned char head_sha1[20];
static int fsck_tree(struct tree *item)
{
+ int retval;
int has_full_path = 0;
+ int has_zero_pad = 0;
+ int has_bad_modes = 0;
+ int has_dup_entries = 0;
+ int not_properly_sorted = 0;
struct tree_entry_list *entry, *last;
last = NULL;
for (entry = item->entries; entry; entry = entry->next) {
if (strchr(entry->name, '/'))
has_full_path = 1;
+ has_zero_pad |= entry->zeropad;
switch (entry->mode) {
/*
* bits..
*/
case S_IFREG | 0664:
- break;
+ if (!check_strict)
+ break;
default:
- printf("tree %s has entry %o %s\n",
- sha1_to_hex(item->object.sha1),
- entry->mode, entry->name);
+ has_bad_modes = 1;
}
if (last) {
switch (verify_ordered(last, entry)) {
case TREE_UNORDERED:
- fprintf(stderr, "tree %s not ordered\n",
- sha1_to_hex(item->object.sha1));
- return -1;
+ not_properly_sorted = 1;
+ break;
case TREE_HAS_DUPS:
- fprintf(stderr, "tree %s has duplicate entries for '%s'\n",
- sha1_to_hex(item->object.sha1),
- entry->name);
- return -1;
+ has_dup_entries = 1;
+ break;
default:
break;
}
last = entry;
}
+ retval = 0;
if (has_full_path) {
fprintf(stderr, "warning: git-fsck-cache: tree %s "
"has full pathnames in it\n",
sha1_to_hex(item->object.sha1));
}
-
- return 0;
+ if (has_zero_pad) {
+ fprintf(stderr, "warning: git-fsck-cache: tree %s "
+ "has zero-padded file modes in it\n",
+ sha1_to_hex(item->object.sha1));
+ }
+ if (has_bad_modes) {
+ fprintf(stderr, "warning: git-fsck-cache: tree %s "
+ "has bad file modes in it\n",
+ sha1_to_hex(item->object.sha1));
+ }
+ if (has_dup_entries) {
+ fprintf(stderr, "error: git-fsck-cache: tree %s "
+ "has duplicate file entries\n",
+ sha1_to_hex(item->object.sha1));
+ retval = -1;
+ }
+ if (not_properly_sorted) {
+ fprintf(stderr, "error: git-fsck-cache: tree %s "
+ "is not properly sorted\n",
+ sha1_to_hex(item->object.sha1));
+ retval = -1;
+ }
+ return retval;
}
static int fsck_commit(struct commit *commit)
{
+ char *buffer = commit->buffer;
+ unsigned char sha1[20];
+
+ if (memcmp(buffer, "tree ", 5))
+ return -1;
+ if (get_sha1_hex(buffer+5, sha1) || buffer[45] != '\n')
+ return -1;
+ buffer += 46;
+ while (!memcmp(buffer, "parent ", 7)) {
+ if (get_sha1_hex(buffer+7, sha1) || buffer[47] != '\n')
+ return -1;
+ buffer += 48;
+ }
+ if (memcmp(buffer, "author ", 7))
+ return -1;
free(commit->buffer);
commit->buffer = NULL;
if (!commit->tree)
return 0;
}
-static int 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 -1;
-
- len = read(fd, hexname, sizeof(hexname));
- close(fd);
- if (len < 40)
- return -1;
-
- if (get_sha1_hex(hexname, sha1) < 0)
- return -1;
-
obj = lookup_object(sha1);
if (!obj) {
- if (!standalone && has_sha1_file(sha1))
- return 0; /* it is in pack */
- return error("%s: invalid sha1 pointer %.40s", path, hexname);
+ 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 int find_file_objects(const char *base, const char *name)
-{
- 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 0;
-
- /*
- * Recurse into directories
- */
- if (S_ISDIR(st.st_mode)) {
- int count = 0;
- DIR *dir = opendir(path);
- if (dir) {
- struct dirent *de;
- while ((de = readdir(dir)) != NULL) {
- if (de->d_name[0] == '.')
- continue;
- count += find_file_objects(path, de->d_name);
- }
- closedir(dir);
- }
- return count;
- }
- if (S_ISREG(st.st_mode))
- return read_sha1_reference(path) == 0;
- return 0;
-}
-
static void get_default_heads(void)
{
- char *git_dir = gitenv(GIT_DIR_ENVIRONMENT) ? : DEFAULT_GIT_DIR_ENVIRONMENT;
- int count = find_file_objects(git_dir, "refs");
- if (!count)
+ for_each_ref(fsck_handle_ref);
+ if (!default_refs)
die("No default references");
}
fsck_sha1_list();
}
+static int fsck_head_link(void)
+{
+ int fd, count;
+ char hex[40];
+ unsigned char sha1[20];
+ static char path[PATH_MAX], link[PATH_MAX];
+ const char *git_dir;
+
+ git_dir = gitenv(GIT_DIR_ENVIRONMENT);
+ if (!git_dir) git_dir = 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;
check_full = 1;
continue;
}
+ if (!strcmp(arg, "--strict")) {
+ check_strict = 1;
+ continue;
+ }
if (*arg == '-')
- usage("git-fsck-cache [--tags] [[--unreachable] [--cache] [--standalone | --full] <head-sha1>*]");
+ usage("git-fsck-cache [--tags] [--root] [[--unreachable] [--cache] [--standalone | --full] [--strict] <head-sha1>*]");
}
if (standalone && check_full)
die("Only one of --standalone or --full can be used.");
if (standalone)
- unsetenv("GIT_ALTERNATE_OBJECT_DIRECTORIES");
+ putenv("GIT_ALTERNATE_OBJECT_DIRECTORIES=");
+ fsck_head_link();
fsck_object_dir(get_object_directory());
if (check_full) {
- int j;
+ struct alternate_object_database *alt;
struct packed_git *p;
prepare_alt_odb();
- for (j = 0; alt_odb[j].base; j++) {
- alt_odb[j].name[-1] = 0; /* was slash */
- fsck_object_dir(alt_odb[j].base);
- alt_odb[j].name[-1] = '/';
+ for (alt = alt_odb_list; alt; alt = alt->next) {
+ char namebuf[PATH_MAX];
+ int namelen = alt->name - alt->base;
+ memcpy(namebuf, alt->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++) {
projects / git.git / blobdiff