From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael J Gruber Subject: [PATCH 3/6] cat-file: do not die on --textconv without textconv filters Date: Fri, 19 Apr 2013 18:44:46 +0200 Message-ID: <06f2d51bf0479f3231b707d88d8d04fcd306c973.1366389739.git.git@drmicha.warpmail.net> References: To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Fri Apr 19 18:45:55 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 1UTERe-0000Ao-ED for gcvg-git-2@plane.gmane.org; Fri, 19 Apr 2013 18:45:54 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031142Ab3DSQpm (ORCPT ); Fri, 19 Apr 2013 12:45:42 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:33806 "EHLO out1-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030840Ab3DSQpk (ORCPT ); Fri, 19 Apr 2013 12:45:40 -0400 Received: from compute3.internal (compute3.nyi.mail.srv.osa [10.202.2.43]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id 24BA320D33 for ; Fri, 19 Apr 2013 12:45:40 -0400 (EDT) Received: from frontend1.nyi.mail.srv.osa ([10.202.2.160]) by compute3.internal (MEProxy); Fri, 19 Apr 2013 12:45:40 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=from:to:subject:date:message-id :in-reply-to:references; s=smtpout; bh=C6SKUgdHrzR2Y+xXFmOQgxVZE u0=; b=UsUnbDgCR/hTZB57oF+UhAqQtFwFpW7aKbvN/Gj9zk5fr+3ctFZeUxM9p RLNDSwXw9plThe7RCRy4DhTujuE2F2NsWPmQ//yt89XWZEJ0ih5zibt570I88VLw SvtECBzetcaVOkmrVODdhwLWufTQU5xW7dHypjSMMXJw1N8KhE= X-Sasl-enc: O1YpH9kHoaAqDDiFyx5hNp729406HFa+xk6HgoeiSZAy 1366389939 Received: from localhost (unknown [46.115.51.241]) by mail.messagingengine.com (Postfix) with ESMTPA id A62F1C80007; Fri, 19 Apr 2013 12:45:39 -0400 (EDT) X-Mailer: git-send-email 1.8.2.1.728.ge98e8b0 In-Reply-To: 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 | 9 +++++---- t/t8007-cat-file-textconv.sh | 20 +++++--------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 40f87b4..dd4e063 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -146,10 +146,11 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name) die("git cat-file --textconv %s: