Re: [PATCH 3/6] cat-file: do not die on --textconv without textconv filters

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Apr 20, 2013, 14:27 UTC
Message-ID: <5172A5E4.7020902@drmicha.warpmail.net>
In-Reply-To: <20130420041737.GC24970@sigill.intra.peff.net>

Jeff King venit, vidit, dixit 20.04.2013 06:17:

Show 19 quoted lines

> On Fri, Apr 19, 2013 at 06:44:46PM +0200, Michael J Gruber wrote:
> 
>> -			die("git cat-file --textconv: unable to run textconv on %s",
>> -			    obj_name);
>> -		break;
>> +		if (textconv_object(obj_context.path, obj_context.mode, sha1, 1, &buf, &size))
>> +			break;
>> +
>> +		/* otherwise expect a blob */
>> +		exp_type = "blob";
>>  
>>  	case 0:
>>  		if (type_from_string(exp_type) == OBJ_BLOB) {
> 
> I'm not sure this is right. What happens with:
> 
>   git cat-file --textconv HEAD:Documentation
> 
> We have failed to textconv, but should we be expecting a blob?

Very true, thanks. I'll reorder so that the --textconv case continues (without break) into the -p case. I think it makes sense to consider "--textconv" to be "at least as pretty as -p".

Michael