From mboxrd@z Thu Jan 1 00:00:00 1970 From: karthik nayak Subject: Re: [PATCH v9 3/5] cat-file: teach cat-file a '--allow-unknown-type' option Date: Wed, 29 Apr 2015 23:13:19 +0530 Message-ID: <55411837.40203@gmail.com> References: <5540D397.8020104@gmail.com> <1430312006-23323-1-git-send-email-karthik.188@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Cc: git@vger.kernel.org, sunshine@sunshineco.com To: Junio C Hamano X-From: git-owner@vger.kernel.org Wed Apr 29 19:43:29 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YnW1A-0001Ce-RP for gcvg-git-2@plane.gmane.org; Wed, 29 Apr 2015 19:43:29 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966369AbbD2RnY (ORCPT ); Wed, 29 Apr 2015 13:43:24 -0400 Received: from mail-pa0-f53.google.com ([209.85.220.53]:33395 "EHLO mail-pa0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965149AbbD2RnX (ORCPT ); Wed, 29 Apr 2015 13:43:23 -0400 Received: by pacwv17 with SMTP id wv17so34124416pac.0 for ; Wed, 29 Apr 2015 10:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; bh=Lv7kDoshERR+9WpUAD+nelgmdyAHxrSlkUED5VEaHEQ=; b=TxaHGIs1ng8plUjl3PIUuST/VKBDLWaE4eslWcaukMhrDqQxpNxNnqRdgA9D10OWaN CZ58vv4YQft3QiJasPOi3OOnvLvjGZ4TzYrerjpxUnsFQw6a+JvcJHb7eVXW5DqchoK2 ctz/ZIc5EcPHJUjjU3+Hkh7Na6YA/3KVJjlNZtydvflJrHXFn5zxzH86Neae1QwLZB3n Wi/B7cOSVcvXkJVS9qwNj08gdqnv/HzfKFrXMI47SfAUulGTF0wZUAYtOqnbKeJkdBNd 3BNybogU/ZGs/oWoRn7HuBHuPvUKzH6/a61+LaKMfCg/2MuxcNZ+38Czcuq7PnxIFwH4 8uiA== X-Received: by 10.68.136.42 with SMTP id px10mr352753pbb.19.1430329403339; Wed, 29 Apr 2015 10:43:23 -0700 (PDT) Received: from [192.168.0.104] ([103.227.98.178]) by mx.google.com with ESMTPSA id lb1sm24100719pab.39.2015.04.29.10.43.20 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2015 10:43:22 -0700 (PDT) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: On 04/29/2015 08:22 PM, Junio C Hamano wrote: > Karthik Nayak writes: > >> Currently 'git cat-file' throws an error while trying to >> print the type or size of a broken/corrupt object. This is >> because these objects are usually of unknown types. >> >> Teach git cat-file a '--allow-unkown-type' option where it prints >> the type or size of a broken/corrupt object without throwing >> an error. > > Drop "Currently" from the description of the problem you are > solving. We know that the problem you have to solve in the code is > current without being told. This comment applies to all patches. Noted. Thanks! > >> Modify '-t' and '-s' options to call sha1_object_info_extended() >> directly to support the '--allow-unkown-type' option. >> >> Helped-by: Junio C Hamano >> Helped-by: Eric Sunshine >> Signed-off-by: Karthik Nayak >> --- >> builtin/cat-file.c | 38 ++++++++++++++++++++++++++------------ >> 1 file changed, 26 insertions(+), 12 deletions(-) >> >> diff --git a/builtin/cat-file.c b/builtin/cat-file.c >> index 53b5376..299e2e5 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 unkown_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 (unkown_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); >> @@ -23,20 +30,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); >> @@ -323,7 +332,7 @@ static int batch_objects(struct batch_options *opt) >> } >> >> static const char * const cat_file_usage[] = { >> - N_("git cat-file (-t | -s | -e | -p | | --textconv) "), >> + N_("git cat-file (-t [--allow-unkown-type]|-s [--allow-unkown-type]|-e|-p||--textconv) "), >> N_("git cat-file (--batch | --batch-check) < "), >> NULL >> }; >> @@ -359,6 +368,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 unkown_type = 0; >> >> const struct option options[] = { >> OPT_GROUP(N_(" can be one of: blob, tree, commit, tag")), >> @@ -369,6 +379,8 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix) >> 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-unkown-type", &unkown_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 }, >> @@ -402,5 +414,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 (unkown_type && opt != 't' && opt != 's') >> + die("git cat-file --allow-unkown-type: use with -s or -t"); >> + return cat_one_file(opt, exp_type, obj_name, unkown_type); >> }