Incorrect Diff!

Pulkit Goyal· Jun 2, 2017, 04:11 UTC · lore

Hey folks!

I was working on a Django project when I got the following diff which is very much confusing.

The diff is pasted at https://bpaste.net/show/c2cb00728ff0.

As you can see on bpaste that in line number 9,10 I have changed "class activationview" to "class activateuser", but in line number 14 the diff is again showing me "class activationview". Maybe Git is trying to be smart here, but the diff is wrong and I was confused.

This is to let you know I faced this problem and to ask if this is already fixed.

Regards

Pulkit Goyal

Junio C Hamano· Jun 2, 2017, 04:55 UTC · re: Pulkit Goyal · lore

Re: Incorrect Diff!

Pulkit Goyal <7895pulkit@gmail.com> writes:

Show 9 quoted lines

> I was working on a Django project when I got the following diff which
> is very much confusing.
>
> The diff is pasted at https://bpaste.net/show/c2cb00728ff0.
>
> As you can see on bpaste that in line number 9,10 I have changed
> "class activationview" to "class activateuser", but in line number 14
> the diff is again showing me "class activationview". Maybe Git is
> trying to be smart here, but the diff is wrong and I was confused.

I do not think Git is trying to be smart at all.

The function context lines @@ .. @@ consistently is showing the name in the preimage of the diff, no?

The function/class header that appears in the preimage before the hunk that begins at line 108 is activationview and that is shown there. So is the header on the hunk that begins at line 149.

So there is nothing remarkable in this patch as far as I can see.