{"thread":{"id":"46095","subject":"Incorrect Diff!","startedAt":"2017-06-02T04:11:40Z","lastAt":"2017-06-02T04:55:26Z","messageCount":2,"participants":["Pulkit Goyal","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"321383","messageId":"CAJ-kjL-Y+x-ZROnNm+Ray54hwxfkA6K6uxYoUVQpa3NmrzbEMg@mail.gmail.com","threadId":"46095","inReplyTo":null,"subject":"Incorrect Diff!","fromName":"Pulkit Goyal","fromEmail":"7895pulkit@gmail.com","sentAt":"2017-06-02T04:11:34Z","receivedAt":"2017-06-02T04:11:40Z","isPatch":false,"sender":{"key":"7895pulkit@gmail.com","avatar":null},"body":"Hey folks!\n\nI was working on a Django project when I got the following diff which\nis very much confusing.\n\nThe diff is pasted at https://bpaste.net/show/c2cb00728ff0.\n\nAs you can see on bpaste that in line number 9,10 I have changed\n\"class activationview\" to \"class activateuser\", but in line number 14\nthe diff is again showing me \"class activationview\". Maybe Git is\ntrying to be smart here, but the diff is wrong and I was confused.\n\nThis is to let you know I faced this problem and to ask if this is\nalready fixed.\n\nRegards\n\nPulkit Goyal\n"},{"id":"321385","messageId":"xmqqinkfyonc.fsf@gitster.mtv.corp.google.com","threadId":"46095","inReplyTo":"CAJ-kjL-Y+x-ZROnNm+Ray54hwxfkA6K6uxYoUVQpa3NmrzbEMg@mail.gmail.com","subject":"Re: Incorrect Diff!","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-06-02T04:55:19Z","receivedAt":"2017-06-02T04:55:26Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pulkit Goyal <7895pulkit@gmail.com> writes:\n\n> I was working on a Django project when I got the following diff which\n> is very much confusing.\n>\n> The diff is pasted at https://bpaste.net/show/c2cb00728ff0.\n>\n> As you can see on bpaste that in line number 9,10 I have changed\n> \"class activationview\" to \"class activateuser\", but in line number 14\n> the diff is again showing me \"class activationview\". Maybe Git is\n> trying to be smart here, but the diff is wrong and I was confused.\n\nI do not think Git is trying to be smart at all.  \n\nThe function context lines @@ .. @@ consistently is showing the name\nin the preimage of the diff, no?  \n\nThe function/class header that appears in the preimage before the\nhunk that begins at line 108 is activationview and that is shown\nthere.  So is the header on the hunk that begins at line 149.\n\nSo there is nothing remarkable in this patch as far as I can see.\n"}]}