* Incorrect Diff!
@ 2017-06-02 4:11 Pulkit Goyal
2017-06-02 4:55 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Pulkit Goyal @ 2017-06-02 4:11 UTC (permalink / raw)
To: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Incorrect Diff!
2017-06-02 4:11 Incorrect Diff! Pulkit Goyal
@ 2017-06-02 4:55 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2017-06-02 4:55 UTC (permalink / raw)
To: Pulkit Goyal; +Cc: git
Pulkit Goyal <7895pulkit@gmail•com> writes:
> 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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-06-02 4:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-02 4:11 Incorrect Diff! Pulkit Goyal
2017-06-02 4:55 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox