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=-3.0 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 12CE41FAF4 for ; Wed, 8 Feb 2017 21:39:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752181AbdBHVjL (ORCPT ); Wed, 8 Feb 2017 16:39:11 -0500 Received: from mail-ot0-f178.google.com ([74.125.82.178]:33976 "EHLO mail-ot0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751050AbdBHVjK (ORCPT ); Wed, 8 Feb 2017 16:39:10 -0500 Received: by mail-ot0-f178.google.com with SMTP id f9so123442541otd.1 for ; Wed, 08 Feb 2017 13:39:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=0Gs4i1cDNi20SSMxM40uc4K9gohm+RNdTxIy3O6cvTM=; b=iFbQCMELvh6SYRoUhvCHI03Lq3Ni47ggsvMLigTZc/YidhDUkVbiYa+g0wvxP8wCuQ p2q2cyLLnKsj3AaXa/uC+y+8f1eL4s6WT4rofm70QEGBH/wxGqYsV0g7Jck+U0BdSwcw Jp2ijIdErBSMZKI001j/bCLkiUDP1RTg5aLxdzdKndxKjAuqnTwgIZtoZ3Rwpgbm5U6/ ITC7U5p7x4OeG0ljA/lMTrSzucU4a3hgxw8GzO7EXN7RhtkBxyUAYBbCG5m1kOVFnVcU X3hfWQuGolgeMoc2pHJFCMg+Bm/ARBN6D9/9s95kAaKKsvijVUFeV6/bx0YeauvSAIl/ Z4lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=0Gs4i1cDNi20SSMxM40uc4K9gohm+RNdTxIy3O6cvTM=; b=f4d0GFKEi9hjVB9FWBhkYY7Pxz+9r9jKKM2nbAsyesRVzOYbIl6l4WyVB+X7ZkBWfS 11FOvHq/stLqCuzRoo2Q9HJXwIdgbgsTkDPJ0eK9kevV95RBhiblmVWo7cH+29/8/P66 LR2kF3rCG6G8O/ckX+GLAiFbmUqKkwU5QBLlKzLaNJXxUDWRo4G3Ec/BHRFfg069cT5m uo2vZvlApjntQDdI4II2aSUyNBZK1q1E3l9zwiKLkk024Nt+yogqAHQX4vmaakN3fkii Vu4zX1RWWsanNtv2+n0pM6+EYmHg8Inb99ZzdRrlwhSm2UO7SzrMtzhpGkqKzV6IP4p0 GYcg== X-Gm-Message-State: AMke39mbab2aIw7yGPLBe7+HD1s7gQEGoOlHi3FS+S++e4G82TAWKobSBEWbUIpNjRLZdS+gy4qI7SjwVQUCbQ== X-Received: by 10.157.51.19 with SMTP id f19mr13171327otc.18.1486588370390; Wed, 08 Feb 2017 13:12:50 -0800 (PST) MIME-Version: 1.0 Received: by 10.157.13.38 with HTTP; Wed, 8 Feb 2017 13:12:49 -0800 (PST) In-Reply-To: References: <271989d5-c383-0c0d-bfcb-f4118f9fa2aa@web.de> <1aa20b4e-782f-a650-eab8-51218b838337@web.de> From: Jack Adrian Zappa Date: Wed, 8 Feb 2017 16:12:49 -0500 Message-ID: Subject: Re: Trying to use xfuncname without success. To: Samuel Lijin Cc: git-mailing-list Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org That was it. I have a .gitattributes file in my home directory. Ahhh, but it's not in my %userprofile% directory, but in my ~ directory. A bit confusing having 2 home directories. I made a link to my .gitconfig, but forgot to make a link to my .gitattributes. Thanks. A On Wed, Feb 8, 2017 at 4:05 PM, Samuel Lijin wrote: > Double check .gitattributes? > > On Feb 8, 2017 2:58 PM, "Jack Adrian Zappa" wrote= : >> >> Thanks Samuel, >> >> That example showed that there must be something wrong in my .git >> directory, because with it, I'm getting the correct output. Moving >> the same lines to my .git/config didn't work. >> >> On Wed, Feb 8, 2017 at 3:46 PM, Samuel Lijin wrote: >> > I just put this togther: https://github.com/sxlijin/xfuncname-test >> > >> > Try cloning and then for any of config1 thru 3, >> > >> > $ cp configX .git/config >> > $ git diff HEAD^ -- test.natvis >> > >> > On Wed, Feb 8, 2017 at 2:42 PM, Jack Adrian Zappa >> > wrote: >> >> Thanks Samuel, >> >> >> >> So, the question is, what is causing this problem on my system? >> >> >> >> Anyone have an idea to help diagnose this problem? >> >> >> >> On Wed, Feb 8, 2017 at 3:24 PM, Samuel Lijin wrot= e: >> >>> On Windows 7, it works for me in both CMD and Git Bash: >> >>> >> >>> $ git --version >> >>> git version 2.11.0.windows.3 >> >>> >> >>> $ git diff HEAD^ --word-diff >> >>> diff --git a/test.natvis b/test.natvis >> >>> index 93396ad..1233b8c 100644 >> >>> --- a/test.natvis >> >>> +++ b/test.natvis >> >>> @@ -18,6 +18,7 @@ test >> >>> >> >>> >> >>> >> >>> {+added_var+} >> >>> >> >>> >> >>> var2 >> >>> >> >>> On Wed, Feb 8, 2017 at 12:37 PM, Ren=C3=A9 Scharfe wr= ote: >> >>>> Am 08.02.2017 um 18:11 schrieb Jack Adrian Zappa: >> >>>>> Thanks Rene, but you seem to have missed the point. NOTHING is >> >>>>> working. No matter what I put there, it doesn't seem to get >> >>>>> matched. >> >>>> >> >>>> I'm not so sure about that. With your example I get this diff >> >>>> without >> >>>> setting diff.natvis.xfuncname: >> >>>> >> >>>> diff --git a/a.natvis b/a.natvis >> >>>> index 7f9bdf5..bc3c090 100644 >> >>>> --- a/a.natvis >> >>>> +++ b/a.natvis >> >>>> @@ -19,7 +19,7 @@ >> >>>> xmlns=3D"http://schemas.microsoft.com/vstudio/debugger/natvis/2010"= > >> >>>> >> >>>> >> >>>> >> >>>> - added_var >> >>>> + added_vars >> >>>> >> >>>> >> >>>> var2 >> >>>> >> >>>> Note the XML namespace in the hunk header. It's put there by the >> >>>> default rule because "xmlns" starts at the beginning of the line. >> >>>> Your >> >>>> diff has nothing there, which means the default rule is not used, >> >>>> i.e. >> >>>> your user-defined rule is in effect. >> >>>> >> >>>> Come to think of it, this line break in the middle of the >> >>>> AutoVisualizer >> >>>> tab might have been added by your email client unintentionally, so >> >>>> that >> >>>> we use different test files, which then of course results in >> >>>> different >> >>>> diffs. Is that the case? >> >>>> >> >>>> Anyway, if I run the following two commands: >> >>>> >> >>>> $ git config diff.natvis.xfuncname "^[\t ]*> >>>> ]+Name=3D\"([^\"]+)\".*$" >> >>>> $ echo '*.natvis diff=3Dnatvis' >.gitattributes >> >>>> >> >>>> ... then I get this, both on Linux (git version 2.11.1) and on >> >>>> Windows >> >>>> (git version 2.11.1.windows.1): >> >>>> >> >>>> diff --git a/a.natvis b/a.natvis >> >>>> index 7f9bdf5..bc3c090 100644 >> >>>> --- a/a.natvis >> >>>> +++ b/a.natvis >> >>>> @@ -19,7 +19,7 @@ test >> >>>> >> >>>> >> >>>> >> >>>> - added_var >> >>>> + added_vars >> >>>> >> >>>> >> >>>> var2 >> >>>> >> >>>>> Just to be sure, I tested your regex and again it didn't work. >> >>>> >> >>>> At this point I'm out of ideas, sorry. :( The only way I was able = to >> >>>> break it was due to mistyping the extension as "netvis" several tim= es >> >>>> for some reason. >> >>>> >> >>>> Ren=C3=A9