On Freitag, 15. April 2011, Michael J Gruber wrote: > Currently, we ignore textconv and binary status for the combined diff > formats (-c, -cc) which was never intended. > > Change this so that combined diff uses the same helpers. > > Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx> > --- > So, just so that I don't get the vapor patch award, here's a WIP passing > Jeff's test. > > Before looking at free()ing what I've introduced and the binary issue I'll > check whether the whole blob/file read hunk in show_patch_diff() can't be > simply subsumed in the fill_textconv() call. It is almost a copy of > diff_populate_filespec() but not quite. > > Also, the situation with worktree is even worse than I thought: > > git diff -m produces a combined diff! > > Also, my patch does not cure "diff -c" against worktree so far, I'm not > textconv'ing the worktree file yet. But then again, "diff -m" sucks here also. > > I'll probably pick this up later today. Hi, thanks for working on this. I tried this patch on my msysgit system and now gitk shows a nice diff for my merged archives. :-) For merges of other binary files without textconf filter (jar) i still get binary output. (but i expected this from the notes above/discussion) thanks, Greetings Peter -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html