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

Re: textconv not invoked when viewing merge commit

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 16, 2011, 16:23 UTC
Message-ID
<7vtydyb1xi.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110416063353.GB28853@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
> OK, but what do you intend to do for a plumbing command _without_
> --textconv? I think what it is doing now (pretending that lines in the
> binary file are relevant, and either truncating output on NUL or spewing
> NULs to the output stream) is just wrong.

Oh, no question about it. "Binary files differ" codepath needs to be added, and independent of if we want to add a fallback textconv.

> Ick, why? That pseudo-diff contains no additional interesting
> information that is not already there (since the "index" line already
> contains the blob sha1s).
True enough.

The only case that might make a difference would be if one side was binary and the other side and the result was text, in which case the user can not just see but read the result, but I don't think it is worth caring about.

Also unlike my weatherbaloon patch, Michael's approach (if it is updated to pass the whole diff options structure instead of just one "do we care about the textconv" bit to intersect_paths() function) will let us determine if the combined path should say "Binary files differ" a lot early, so there is no need to worry about what to do on binary files in the places we would be adding textconv anymore.

Previous: Jeff King
Message 25 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.