Re: git diff woes

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Nov 12, 2007, 10:01 UTC
Message-ID: <Pine.LNX.4.64.0711120958500.4362@racer.site>
In-Reply-To: <4738208D.1080003@op5.se>

Hi,

On Mon, 12 Nov 2007, Andreas Ericsson wrote:

Show 14 quoted lines

> I recently ran into an oddity with the excellent git diff output
> format. When a function declaration changes in the same patch as
> something else in a function, the old declaration is used with the
> diff hunk-headers.
> 
> [...]
> 
> It definitely looks like a bug, but really isn't, since an earlier hunk
> (pasted below) changes the declaration.
>
> [...]
>
> This makes it impossible to trust the hunk-header info if the declaration
> changes.

Huh? You admit yourself that it is not a bug. And sure you can trust the hunk header. Like most of the things, the relate to the _original_ version, since the diff is meant to be applied as a forward patch.

So for all practical matters, the diff shows the correct thing: "in this hunk, which (still) belongs to that function, change this and this."

Of course, that is only the case if you accept that the diff should be applied _in total_, not piecewise. IOW if you are a fan of GNU patch which happily clobbers your file until it fails with the last hunk, you will not be happy.

Ciao, Dscho