From: Jack Adrian Zappa <adrianh.bsc@gmail.com>
To: Samuel Lijin <sxlijin@gmail.com>
Cc: "René Scharfe" <l.s.r@web.de>, git-mailing-list <git@vger.kernel.org>
Subject: Re: Trying to use xfuncname without success.
Date: Wed, 8 Feb 2017 16:03:55 -0500 [thread overview]
Message-ID: <CAKepmahgo2mbzc1Ws6vi6kRzqsD=UWcOGi0w+dz3FbgafEBmFw@mail.gmail.com> (raw)
In-Reply-To: <CAJZjrdWouNaNKU2sX89Xh=QqSbdB7srwgufuquYL_1B7H324Yw@mail.gmail.com>
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 <sxlijin@gmail.com> 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 <adrianh.bsc@gmail.com> 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 <sxlijin@gmail.com> wrote:
>>> 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
>>>
>>>
>>> <!-- Non-blank line -->
>>> {+<Item Name="added var">added_var</Item>+}
>>>
>>>
>>> <Item Name="var2">var2</Item>
>>>
>>> On Wed, Feb 8, 2017 at 12:37 PM, René Scharfe <l.s.r@web.de> wrote:
>>>> 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="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
>>>>
>>>>
>>>> <!-- Non-blank line -->
>>>> - <Item Name="added var">added_var</Item>
>>>> + <Item Name="added var">added_vars</Item>
>>>>
>>>>
>>>> <Item Name="var2">var2</Item>
>>>>
>>>> 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 ]*<Type[\t ]+Name=\"([^\"]+)\".*$"
>>>> $ echo '*.natvis diff=natvis' >.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
>>>>
>>>>
>>>> <!-- Non-blank line -->
>>>> - <Item Name="added var">added_var</Item>
>>>> + <Item Name="added var">added_vars</Item>
>>>>
>>>>
>>>> <Item Name="var2">var2</Item>
>>>>
>>>>> 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 times
>>>> for some reason.
>>>>
>>>> René
next prev parent reply other threads:[~2017-02-08 21:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 19:21 Trying to use xfuncname without success Jack Adrian Zappa
2017-02-07 23:18 ` René Scharfe
2017-02-08 17:11 ` Jack Adrian Zappa
2017-02-08 18:37 ` René Scharfe
2017-02-08 20:24 ` Samuel Lijin
2017-02-08 20:42 ` Jack Adrian Zappa
2017-02-08 20:46 ` Samuel Lijin
2017-02-08 21:03 ` Jack Adrian Zappa [this message]
[not found] ` <CAKepmai3fBZMS2dXaJyvnP36LooLh8yjn1T6vGG=Pi1B1LMaCQ@mail.gmail.com>
[not found] ` <CAJZjrdUcxe_K91CQXz_TgGHgXMsKaddwG5+JEWJ53pv5_GO1zw@mail.gmail.com>
2017-02-08 21:12 ` Jack Adrian Zappa
2017-02-09 0:00 ` Jack Adrian Zappa
2017-02-09 0:01 ` Jack Adrian Zappa
2017-02-09 0:10 ` Jack Adrian Zappa
2017-02-10 17:24 ` René Scharfe
2017-02-08 20:39 ` Jack Adrian Zappa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKepmahgo2mbzc1Ws6vi6kRzqsD=UWcOGi0w+dz3FbgafEBmFw@mail.gmail.com' \
--to=adrianh.bsc@gmail.com \
--cc=git@vger.kernel.org \
--cc=l.s.r@web.de \
--cc=sxlijin@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).