Merge branch 'dt/cat-file-follow-symlinks'

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 43338bb7de46e8e2d4babe9454f7fd32e8e54c37..049a95f1f113289a1a01f74a2485d1e9b282209f 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -10,13 +10,20 @@
 #include "streaming.h"
 #include "tree-walk.h"
 
-static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
+static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
+                       int unknown_type)
 {
        unsigned char sha1[20];
        enum object_type type;
        char *buf;
        unsigned long size;
        struct object_context obj_context;
+       struct object_info oi = {NULL};
+       struct strbuf sb = STRBUF_INIT;
+       unsigned flags = LOOKUP_REPLACE_OBJECT;
+
+       if (unknown_type)
+               flags |= LOOKUP_UNKNOWN_OBJECT;
 
        if (get_sha1_with_context(obj_name, 0, sha1, &obj_context))
                die("Not a valid object name %s", obj_name);
@@ -24,20 +31,22 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name)
        buf = NULL;
        switch (opt) {
        case 't':
-               type = sha1_object_info(sha1, NULL);
-               if (type > 0) {
-                       printf("%s\n", typename(type));
+               oi.typename = &sb;
+               if (sha1_object_info_extended(sha1, &oi, flags) < 0)
+                       die("git cat-file: could not get object info");
+               if (sb.len) {
+                       printf("%s\n", sb.buf);
+                       strbuf_release(&sb);
                        return 0;
                }
                break;
 
        case 's':
-               type = sha1_object_info(sha1, &size);
-               if (type > 0) {
-                       printf("%lu\n", size);
-                       return 0;
-               }
-               break;
+               oi.sizep = &size;
+               if (sha1_object_info_extended(sha1, &oi, flags) < 0)
+                       die("git cat-file: could not get object info");
+               printf("%lu\n", size);
+               return 0;
 
        case 'e':
                return !has_sha1_file(sha1);
@@ -357,7 +366,7 @@ static int batch_objects(struct batch_options *opt)
 }
 
 static const char * const cat_file_usage[] = {
-       N_("git cat-file (-t | -s | -e | -p | <type> | --textconv) <object>"),
+       N_("git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|<type>|--textconv) <object>"),
        N_("git cat-file (--batch | --batch-check) [--follow-symlinks] < <list-of-objects>"),
        NULL
 };
@@ -392,16 +401,19 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
        int opt = 0;
        const char *exp_type = NULL, *obj_name = NULL;
        struct batch_options batch = {0};
+       int unknown_type = 0;
 
        const struct option options[] = {
                OPT_GROUP(N_("<type> can be one of: blob, tree, commit, tag")),
-               OPT_SET_INT('t', NULL, &opt, N_("show object type"), 't'),
-               OPT_SET_INT('s', NULL, &opt, N_("show object size"), 's'),
-               OPT_SET_INT('e', NULL, &opt,
+               OPT_CMDMODE('t', NULL, &opt, N_("show object type"), 't'),
+               OPT_CMDMODE('s', NULL, &opt, N_("show object size"), 's'),
+               OPT_CMDMODE('e', NULL, &opt,
                            N_("exit with zero when there's no error"), 'e'),
-               OPT_SET_INT('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
-               OPT_SET_INT(0, "textconv", &opt,
+               OPT_CMDMODE('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
+               OPT_CMDMODE(0, "textconv", &opt,
                            N_("for blob objects, run textconv on object's content"), 'c'),
+               OPT_BOOL( 0, "allow-unknown-type", &unknown_type,
+                         N_("allow -s and -t to work with broken/corrupt objects")),
                { OPTION_CALLBACK, 0, "batch", &batch, "format",
                        N_("show info and content of objects fed from the standard input"),
                        PARSE_OPT_OPTARG, batch_option_callback },
@@ -415,9 +427,6 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
 
        git_config(git_cat_file_config, NULL);
 
-       if (argc != 3 && argc != 2)
-               usage_with_options(cat_file_usage, options);
-
        argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);
 
        if (opt) {
@@ -444,5 +453,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
        if (batch.enabled)
                return batch_objects(&batch);
 
-       return cat_one_file(opt, exp_type, obj_name);
+       if (unknown_type && opt != 't' && opt != 's')
+               die("git cat-file --allow-unknown-type: use with -s or -t");
+       return cat_one_file(opt, exp_type, obj_name, unknown_type);
 }