Re: Trying to use xfuncname without success.

2017-02-10 Thread René Scharfe
Am 09.02.2017 um 01:10 schrieb Jack Adrian Zappa: where it has grabbed a line at 126 and is using that for the hunk header. When I say that, I mean that it is using that line for *every* hunk header, for every change, regardless if it has passed a hunk head that it should have matched. Stran

Re: Trying to use xfuncname without success.

2017-02-08 Thread Jack Adrian Zappa
> where it has grabbed a line at 126 and is using that for the hunk header. When I say that, I mean that it is using that line for *every* hunk header, for every change, regardless if it has passed a hunk head that it should have matched. On Wed, Feb 8, 2017 at 7:01 PM, Jack Adrian Zappa wr

Re: Trying to use xfuncname without success.

2017-02-08 Thread Jack Adrian Zappa
Tried to copy the .git/config file over to the non-working repository and it didn't seem to do anything. Could the git database be partially corrupted? On Wed, Feb 8, 2017 at 7:00 PM, Jack Adrian Zappa wrote: > Well, it mostly works, but I'm getting some weirdness where it has > grabbed a line a

Re: Trying to use xfuncname without success.

2017-02-08 Thread Jack Adrian Zappa
Well, it mostly works, but I'm getting some weirdness where it has grabbed a line at 126 and is using that for the hunk header. Strange thing is, I move the file to another repository, commit it, make a change to the fileand do a diff, and it gets the correct hunk header. I'm at a loss. :( On We

Re: Trying to use xfuncname without success.

2017-02-08 Thread Jack Adrian Zappa
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

Re: Trying to use xfuncname without success.

2017-02-08 Thread Jack Adrian Zappa
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/sxl

Re: Trying to use xfuncname without success.

2017-02-08 Thread Samuel Lijin
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 pro

Re: Trying to use xfuncname without success.

2017-02-08 Thread Jack Adrian Zappa
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 wrote: > On Windows 7, it works for me in both CMD and Git Bash: > > $ git --version > git version 2.11.0.windows.3 > >

Re: Trying to use xfuncname without success.

2017-02-08 Thread Jack Adrian Zappa
> I'm not so sure about that. With your example I get this diff without setting diff.natvis.xfuncname: So, to make sure we are on the same page, I removed the diff.natvis.xfuncname from the .gitconfig and .git/config. My output was: C:\Users\adrianh\Documents\tmp>git diff diff --git a/test.natv

Re: Trying to use xfuncname without success.

2017-02-08 Thread Samuel Lijin
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+} va

Re: Trying to use xfuncname without success.

2017-02-08 Thread René Scharfe
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 --

Re: Trying to use xfuncname without success.

2017-02-08 Thread 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. Just to be sure, I tested your regex and again it didn't work. Someone on the SO site stated they could get it to work on FreeBSD and I'm on Windows, so this might

Re: Trying to use xfuncname without success.

2017-02-07 Thread René Scharfe
Am 07.02.2017 um 20:21 schrieb Jack Adrian Zappa: I'm trying to setup a hunk header for .natvis files. For some reason, it doesn't seem to be working. I'm following their instructions from here, which doesn't say much in terms of restrictions of the regex, such as, is the matched item considered

Trying to use xfuncname without success.

2017-02-07 Thread Jack Adrian Zappa
I'm trying to specify a hunk header using xfuncname, and it just doesn't want to work. The full question is on SO here: http://stackoverflow.com/questions/42078376/why-isnt-my-xfuncname-working-in-my-gitconfig-file But the basic gist is that no matter what regex I specify, git will not recognise