From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael J Gruber Subject: [PATCHv3 4/7] cat-file: do not die on --textconv without textconv filters Date: Fri, 10 May 2013 17:10:13 +0200 Message-ID: References: <7vy5c1l6nb.fsf@alter.siamese.dyndns.org> Cc: Jeff King , Junio C Hamano , Matthieu Moy To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri May 10 17:11:50 2013 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 1Uaoz1-0006zX-Oq for gcvg-git-2@plane.gmane.org; Fri, 10 May 2013 17:11:44 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754849Ab3EJPLl (ORCPT ); Fri, 10 May 2013 11:11:41 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:50845 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754618Ab3EJPLh (ORCPT ); Fri, 10 May 2013 11:11:37 -0400 Received: from compute1.internal (compute1.nyi.mail.srv.osa [10.202.2.41]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id EA1F820BE3; Fri, 10 May 2013 11:11:34 -0400 (EDT) Received: from frontend1.nyi.mail.srv.osa ([10.202.2.160]) by compute1.internal (MEProxy); Fri, 10 May 2013 11:11:34 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; s=smtpout; bh=bg wI4J0bXG0U+kMdys4mR3cVPAU=; b=c38FTNEMUJHJ9QIXQccKgzAVkwFSz74q1j 0SWbvTp2Ny/OPPP0Z3HyMRvZtv3SY4IrMsrzOZ68CxYCW/ZyuKwrstnTaRZncngB L8lqAMHEY7HLnnGhrJMa8FHYnLjeKHdcTgmMw1eW17AHGJBy2ATJ/oNS5L+fUBRq 91cAqgcQ4= X-Sasl-enc: kkCwdwfoFiD0dxsNvLaHNpExDPe9N/sqQyzby/YN6Asz 1368198693 Received: from localhost (unknown [213.221.117.228]) by mail.messagingengine.com (Postfix) with ESMTPA id DCC9CC80010; Fri, 10 May 2013 11:11:33 -0400 (EDT) X-Mailer: git-send-email 1.8.3.rc1.406.gf4dce7e In-Reply-To: <7vy5c1l6nb.fsf@alter.siamese.dyndns.org> In-Reply-To: References: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: When a command is supposed to use textconv filters (by default or with "--textconv") and none are configured then the blob is output without conversion; the only exception to this rule is "cat-file --textconv". Make it behave like the rest of textconv aware commands. Signed-off-by: Michael J Gruber --- builtin/cat-file.c | 18 ++++++++---------- t/t8007-cat-file-textconv.sh | 20 +++++--------------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 045cee7..bd62373 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -48,6 +48,14 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name) case 'e': return !has_sha1_file(sha1); + case 'c': + if (!obj_context.path[0]) + die("git cat-file --textconv %s: