Merge branch 'np/delta' into next

diff --git a/fsck-objects.c b/fsck-objects.c
index 4ddd67699cfefccee34caa38f2334789ef43dbfc..98421aab308086edc871001842dea1f8a06af71c 100644 (file)
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -8,16 +8,16 @@
 #include "tag.h"
 #include "refs.h"
 #include "pack.h"
+#include "cache-tree.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 check_strict = 0;
-static int keep_cache_objects = 0; 
+static int keep_cache_objects = 0;
 static unsigned char head_sha1[20];
 
 #ifdef NO_D_INO_IN_DIRENT
@@ -68,7 +68,7 @@ static void check_connectivity(void)
                        continue;
 
                if (!obj->parsed) {
-                       if (!standalone && has_sha1_file(obj->sha1))
+                       if (has_sha1_file(obj->sha1))
                                ; /* it is in pack */
                        else
                                printf("missing %s %s\n",
@@ -82,7 +82,7 @@ static void check_connectivity(void)
                        for (j = 0; j < refs->count; j++) {
                                struct object *ref = refs->ref[j];
                                if (ref->parsed ||
-                                   (!standalone && has_sha1_file(ref->sha1)))
+                                   (has_sha1_file(ref->sha1)))
                                        continue;
                                printf("broken link from %7s %s\n",
                                       obj->type, sha1_to_hex(obj->sha1));
@@ -390,7 +390,7 @@ static int fsck_handle_ref(const char *refname, const unsigned char *sha1)
 
        obj = lookup_object(sha1);
        if (!obj) {
-               if (!standalone && has_sha1_file(sha1)) {
+               if (has_sha1_file(sha1)) {
                        default_refs++;
                        return 0; /* it is in a pack */
                }
@@ -439,6 +439,23 @@ 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);
+               mark_reachable(obj, REACHABLE);
+               obj->used = 1;
+               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;
@@ -464,10 +481,6 @@ 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;
@@ -477,14 +490,9 @@ int main(int argc, char **argv)
                        continue;
                }
                if (*arg == '-')
-                       usage("git-fsck-objects [--tags] [--root] [[--unreachable] [--cache] [--standalone | --full] [--strict] <head-sha1>*]");
+                       usage("git-fsck-objects [--tags] [--root] [[--unreachable] [--cache] [--full] [--strict] <head-sha1>*]");
        }
 
-       if (standalone && check_full)
-               die("Only one of --standalone or --full can be used.");
-       if (standalone)
-               putenv("GIT_ALTERNATE_OBJECT_DIRECTORIES=");
-
        fsck_head_link();
        fsck_object_dir(get_object_directory());
        if (check_full) {
@@ -557,6 +565,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();