From: Junio C Hamano <gitster@pobox•com>
To: Karthik Nayak <karthik.188@gmail•com>
Cc: git@vger•kernel.org, sunshine@sunshineco•com
Subject: Re: [PATCH v6 2/4] cat-file: teach cat-file a '--literally' option
Date: Thu, 02 Apr 2015 12:08:41 -0700 [thread overview]
Message-ID: <xmqqd23mjqkm.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1427972382-15477-1-git-send-email-karthik.188@gmail.com> (Karthik Nayak's message of "Thu, 2 Apr 2015 16:29:42 +0530")
Karthik Nayak <karthik.188@gmail•com> writes:
> Currently 'git cat-file' throws an error while trying to
> print the type or size of a broken/corrupt object which is
> created using 'git hash-object --literally'. This is
> because these objects are usually of unknown types.
>
> Teach git cat-file a '--literally' option where it prints
> the type or size of a broken/corrupt object without throwing
> an error.
>
> Modify '-t' and '-s' options to call sha1_object_info_extended()
> directly to support the '--literally' option.
>
> Helped-by: Junio C Hamano <gitster@pobox•com>
> Helped-by: Eric Sunshine <sunshine@sunshineco
s/$/.com/ perhaps?
> Signed-off-by: Karthik Nayak <karthik.188@gmail•com>
> ---
> builtin/cat-file.c | 38 +++++++++++++++++++++++++++++---------
> 1 file changed, 29 insertions(+), 9 deletions(-)
>
> diff --git a/builtin/cat-file.c b/builtin/cat-file.c
> index df99df4..91ceae0 100644
> --- a/builtin/cat-file.c
> +++ b/builtin/cat-file.c
> @@ -9,13 +9,20 @@
> #include "userdiff.h"
> #include "streaming.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 literally)
> {
> 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 (literally)
> + flags |= LOOKUP_LITERALLY;
>
> if (get_sha1_with_context(obj_name, 0, sha1, &obj_context))
> die("Not a valid object name %s", obj_name);
> @@ -23,16 +30,24 @@ 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.typep = &type;
> + oi.typename = &sb;
> + if (sha1_object_info_extended(sha1, &oi, flags) < 0)
> + die("git cat-file: could not get object info");
> + if (type >= 0 && sb.len) {
> + printf("%s\n", sb.buf);
> + strbuf_release(&sb);
> return 0;
> }
> break;
>
> case 's':
> - type = sha1_object_info(sha1, &size);
> - if (type > 0) {
> + oi.typep = &type;
> + oi.typename = &sb;
> + oi.sizep = &size;
> + if (sha1_object_info_extended(sha1, &oi, flags) < 0)
> + die("git cat-file: could not get object info");
> + if (type >= 0 && sb.len) {
> printf("%lu\n", size);
> return 0;
> }
> @@ -323,7 +338,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 [--literally]|-s [--literally]|-e|-p|<type>|--textconv) <object>"),
> N_("git cat-file (--batch | --batch-check) < <list-of-objects>"),
> NULL
> };
> @@ -359,6 +374,7 @@ 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 literally = 0;
>
> const struct option options[] = {
> OPT_GROUP(N_("<type> can be one of: blob, tree, commit, tag")),
> @@ -369,6 +385,8 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
> OPT_SET_INT('p', NULL, &opt, N_("pretty-print object's content"), 'p'),
> OPT_SET_INT(0, "textconv", &opt,
> N_("for blob objects, run textconv on object's content"), 'c'),
> + OPT_BOOL( 0, "literally", &literally,
> + N_("get information about corrupt objects for debugging Git")),
> { OPTION_CALLBACK, 0, "batch", &batch, "format",
> N_("show info and content of objects fed from the standard input"),
> PARSE_OPT_OPTARG, batch_option_callback },
> @@ -380,7 +398,7 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
>
> git_config(git_cat_file_config, NULL);
>
> - if (argc != 3 && argc != 2)
> + if (argc < 2 || argc > 4)
> usage_with_options(cat_file_usage, options);
>
> argc = parse_options(argc, argv, prefix, options, cat_file_usage, 0);
> @@ -405,5 +423,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 (literally && opt != 't' && opt != 's')
> + die("git cat-file --literally: use with -s or -t");
> + return cat_one_file(opt, exp_type, obj_name, literally);
> }
next prev parent reply other threads:[~2015-04-02 19:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-02 10:53 [PATCH v6 0/4] cat-file: add a '--literally' option karthik nayak
2015-04-02 10:58 ` [PATCH v6 1/4] sha1_file.c: support reading from a loose object of unknown type Karthik Nayak
2015-04-02 19:12 ` Junio C Hamano
2015-04-02 10:59 ` [PATCH v6 2/4] cat-file: teach cat-file a '--literally' option Karthik Nayak
2015-04-02 19:08 ` Junio C Hamano [this message]
2015-04-03 16:25 ` karthik nayak
2015-04-02 11:00 ` [PATCH v6 3/4] cat-file: add documentation for " Karthik Nayak
2015-04-02 11:00 ` [PATCH v6 4/4] t1006: add tests for git cat-file --literally Karthik Nayak
2015-04-02 20:35 ` [PATCH v6 0/4] cat-file: add a '--literally' option Junio C Hamano
2015-04-04 4:13 ` karthik nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqd23mjqkm.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=karthik.188@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox