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

Re: textconv not invoked when viewing merge commit

From
Jeff King <peff@peff.net>
Date
Apr 14, 2011, 20:23 UTC
Message-ID
<20110414202356.GB6525@sigill.intra.peff.net>
In-Reply-To
<7v8vvcha2s.fsf@alter.siamese.dyndns.org>
On Thu, Apr 14, 2011 at 01:06:19PM -0700, Junio C Hamano wrote:
Show 10 quoted lines
> Instead, I think we should just use "Binary blob $SHA-1\n" as if that is
> the textconv of a binary file without textconv filter.  That would
> certainly make the code much simpler, and more importantly, the output
> would become more pleasant. We would show something like:
> 
>     - Binary blob bc3c57058faba66f6a7a947e1e9642f47053b5bb
>      -Binary blob 536e55524db72bd2acf175208aef4f3dfc148d42
>     ++Binary blob 67cfeb2016b24df1cb406c18145efd399f6a1792
> 
> if we did so.

Yeah, I think that is pretty readable. But it gives me a funny feeling to encode magic strings inside actual diff output. That is, the output is indistinguishable from a file which contained the "Binary blob..." strings.

I can't think of a case where it matters, though, so maybe it is just paranoia.

We do something similar for textconv, of course, but we always knew that was a human-only thing, and it isn't enabled for plumbing commands. This would be.

-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 10 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.