git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] combine-diff: use textconv for combined diff format

From
Peter Oberndorfer <kumbayo84@arcor.de>
Date
Apr 21, 2011, 16:08 UTC
Message-ID
<201104211808.06400.kumbayo84@arcor.de>
In-Reply-To
<36a715a966a22207135f60532e723f6d87dd1ffb.1302881295.git.git@drmicha.warpmail.net>
On Freitag, 15. April 2011, Michael J Gruber wrote:
Show 23 quoted lines
> 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@drmicha.warpmail.net>
> ---
> 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

Previous: Jeff KingNext: Matthieu Moy
Message 19 of 25 in “textconv not invoked when viewing merge commit”
  1. Peter OberndorferApr 11, 2011
  2. Michael J GruberApr 12, 2011
  3. Jeff KingApr 14, 2011
  4. Jeff KingApr 14, 2011
  5. Junio C HamanoApr 14, 2011
  6. Jeff KingApr 14, 2011
  7. Michael J GruberApr 14, 2011
  8. Junio C HamanoApr 14, 2011
  9. Junio C HamanoApr 14, 2011
  10. Jeff KingApr 14, 2011
  11. Junio C HamanoApr 14, 2011
  12. Jeff KingApr 14, 2011
  13. combine-diff: use textconv for combined diff formatMichael J Gruber, Apr 15, 2011
  14. Junio C HamanoApr 15, 2011
  15. Michael J GruberApr 16, 2011
  16. Junio C HamanoApr 16, 2011
  17. Jakub NarebskiApr 16, 2011
  18. Jeff KingApr 15, 2011
  19. Peter OberndorferApr 21, 2011
  20. Matthieu MoyApr 15, 2011
  21. Junio C HamanoApr 15, 2011
  22. Jeff KingApr 16, 2011
  23. Junio C HamanoApr 16, 2011
  24. Jeff KingApr 16, 2011
  25. Junio C HamanoApr 16, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.