From: Alexander Gladysh Date: Thu, 04 Sep 2008 09:20:21 GMT Subject: Re: Git Gui does not want to work on chunk level Message-ID: In-Reply-To: <20080903230814.GJ28315@spearce.org> On Thu, Sep 4, 2008 at 3:08 AM, Shawn O. Pearce wrote: > Alexander Gladysh wrote: >> On Wed, Aug 27, 2008 at 1:16 PM, Alexander Gladysh wrote: >> > I like 'stage hunk for commit' feature in Git Gui, but often it gives >> > me an error message box: >> > >> > fatal: git-apply: bad git-diff - inconsistent old filename on line 4 > ... > I've never seen that before, but its clearly dumping a bad diff > into git-apply. > > Open up lib/diff.tcl and find "proc apply_hunk". Inside of the > catch maybe insert a puts to see the diff, e.g.: > <...> > Then if you can scrub the context and +/- lines for a bad diff and > send us at least the headers, or tell us how they are malformed, > it would help to debug it. Thank you! Header looks well-formed to me: diff --git a/path/file.ext b/path/file.ext --- a/path/file.ext +++ b/path/file.ext I have sent you full output privately. I do not see anything unusual in it... Anyplace where I may put more logging? Thanks again, Alexander.