[PATCH] Split external diff command interface to a separate file.

diff --git a/fsck-cache.c b/fsck-cache.c
index 12443b165578fc458ea3fa66999ed77641aad209..f9b1431dd8f4f3b426a7e410de952277aaa11401 100644 (file)
--- a/fsck-cache.c
+++ b/fsck-cache.c
@@ -9,6 +9,8 @@
 
 #define REACHABLE 0x0001
 
+static int show_root = 0;
+static int show_tags = 0;
 static int show_unreachable = 0;
 static unsigned char head_sha1[20];
 
@@ -55,7 +57,7 @@ static int fsck_commit(unsigned char *sha1, void *data, unsigned long size)
                return -1;
        if (!commit->tree)
                return -1;
-       if (!commit->parents)
+       if (!commit->parents && show_root)
                printf("root %s\n", sha1_to_hex(sha1));
        if (!commit->date)
                printf("bad commit date in %s\n", sha1_to_hex(sha1));
@@ -73,6 +75,7 @@ static int fsck_tag(unsigned char *sha1, void *data, unsigned long size)
 {
        int typelen, taglen;
        unsigned char object[20];
+       char object_hex[60];
        const char *type_line, *tag_line, *sig_line;
 
        if (size < 64)
@@ -98,10 +101,15 @@ static int fsck_tag(unsigned char *sha1, void *data, unsigned long size)
                return -1;
        taglen = sig_line - tag_line - strlen("tag \n");
 
-       printf("tagged %.*s %s (%.*s)\n",
+       if (!show_tags)
+               return 0;
+
+       strcpy(object_hex, sha1_to_hex(object));
+       printf("tagged %.*s %s (%.*s) in %s\n",
                typelen, type_line + 5,
-               sha1_to_hex(object),
-               taglen, tag_line + 4);
+               object_hex,
+               taglen, tag_line + 4,
+               sha1_to_hex(sha1));
        return 0;
 }
 
@@ -185,6 +193,25 @@ int main(int argc, char **argv)
        int i, heads;
        char *sha1_dir;
 
+       for (i = 1; i < argc; i++) {
+               const char *arg = argv[i];
+
+               if (!strcmp(arg, "--unreachable")) {
+                       show_unreachable = 1;
+                       continue;
+               }
+               if (!strcmp(arg, "--tags")) {
+                       show_tags = 1;
+                       continue;
+               }
+               if (!strcmp(arg, "--root")) {
+                       show_root = 1;
+                       continue;
+               }
+               if (*arg == '-')
+                       usage("fsck-cache [--tags] [[--unreachable] <head-sha1>*]");
+       }
+
        sha1_dir = getenv(DB_ENVIRONMENT) ? : DEFAULT_DB_ENVIRONMENT;
        for (i = 0; i < 256; i++) {
                static char dir[4096];
@@ -194,18 +221,19 @@ int main(int argc, char **argv)
 
        heads = 0;
        for (i = 1; i < argc; i++) {
-               if (!strcmp(argv[i], "--unreachable")) {
-                       show_unreachable = 1;
+               const char *arg = argv[i]; 
+
+               if (*arg == '-')
                        continue;
-               }
-               if (!get_sha1_hex(argv[i], head_sha1)) {
+
+               if (!get_sha1_hex(arg, 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>*]");
+               error("expected sha1, got %s", arg);
        }
 
        if (!heads) {