From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 27B261F40E for ; Wed, 3 Aug 2016 18:23:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753497AbcHCSXA (ORCPT ); Wed, 3 Aug 2016 14:23:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38506 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751535AbcHCSW7 (ORCPT ); Wed, 3 Aug 2016 14:22:59 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0800E550B1; Wed, 3 Aug 2016 18:12:21 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-59.phx2.redhat.com [10.3.116.59]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u73ICJJJ008342; Wed, 3 Aug 2016 14:12:20 -0400 Subject: Re: appending a pattern to the default "diff.cpp.xfuncname" To: Jeff King References: <40ceebb8-b343-a5ca-e7ff-23cccc181528@redhat.com> <20160803180213.o7xpm4c4tw5rixmy@sigill.intra.peff.net> Cc: public git mailing list From: Laszlo Ersek Message-ID: <03265a89-fbe8-653a-fb55-ca436c48e39d@redhat.com> Date: Wed, 3 Aug 2016 20:12:19 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160803180213.o7xpm4c4tw5rixmy@sigill.intra.peff.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 03 Aug 2016 18:12:21 +0000 (UTC) Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On 08/03/16 20:02, Jeff King wrote: > On Wed, Aug 03, 2016 at 12:16:14PM +0200, Laszlo Ersek wrote: > >> I've used diff..xfuncname with great success for file s that >> I defined myself. However, now I would like to append an extra pattern >> to the TYPE=cpp case (for which git has builtin patterns). Is there an >> easy way to do this? >> >> I figured I could open-code the builtin patterns from "userdiff.c", and >> then append my new pattern to those, but it looks kinda gross :) > > Unfortunately, no, the config system has no notion of "append to this > value". So you are stuck with extracting the builtin value (which > annoyingly, you cannot even get without looking at the source code!), > and repeating it in your config file. Thank you for confirming! Laszlo