git-send-pack: actually send the object pack

diff --git a/fsck-cache.c b/fsck-cache.c
index 49c606f87f410ebfecc491999b45d246954ddd55..4e193524115dfa0ad808514a3baab34240d78cba 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -6,6 +6,7 @@
 #include "tree.h"
 #include "blob.h"
 #include "tag.h"
+#include "pack.h"
 
 #define REACHABLE 0x0001
 
@@ -13,6 +14,7 @@ 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];
 
@@ -374,10 +376,20 @@ static void get_default_heads(void)
                die("No default references");
 }
 
+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();
+}
+
 int main(int argc, char **argv)
 {
        int i, heads;
-       char *sha1_dir;
 
        for (i = 1; i < argc; i++) {
                const char *arg = argv[i];
@@ -402,17 +414,45 @@ int main(int argc, char **argv)
                        standalone = 1;
                        continue;
                }
+               if (!strcmp(arg, "--full")) {
+                       check_full = 1;
+                       continue;
+               }
                if (*arg == '-')
-                       usage("git-fsck-cache [--tags] [[--unreachable] [--cache] <head-sha1>*]");
+                       usage("git-fsck-cache [--tags] [[--unreachable] [--cache] [--standalone | --full] <head-sha1>*]");
        }
 
-       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_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++) {
+                       alt_odb[j].name[-1] = 0; /* was slash */
+                       fsck_object_dir(alt_odb[j].base);
+                       alt_odb[j].name[-1] = '/';
+               }
+               prepare_packed_git();
+               for (p = packed_git; p; p = p->next)
+                       /* verify gives error messages itself */
+                       verify_pack(p); 
+
+               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++) {