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

Re: textconv not invoked when viewing merge commit

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Apr 12, 2011, 09:04 UTC
Message-ID
<4DA415AB.9020008@drmicha.warpmail.net>
In-Reply-To
<201104111912.47547.kumbayo84@arcor.de>
Peter Oberndorfer venit, vidit, dixit 11.04.2011 19:12:
Show 14 quoted lines
> Hi,
> 
> i currently use a textconv filter to show contents of a zip like archive in a user readable format(as a list of contained files).
> 
> This works fine, except for merge commits.
> For merge commits i see the diff of the binary contents of the file.
> 
> Is this intentional?
> git help gitattributes mentions no such limitation.
> Anywhere else(gitk(on non merge commit), git gui blame) i see the the filtered textual representation of the file.
> 
> I tried 1.7.4 msysgit and current master
> 
> Greetings Peter

textconv is applied for "diff -m" but not for combined diffs (-c, --cc) at the moment. They go through a completely different codepath, so it is expected code-wise (not a bug per se) but not ui-wise.

Looking at the code and trying to dig something up atm...
Michael
Previous: Peter OberndorferNext: Jeff King
Message 2 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.