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 16, 2011, 01:47 UTC
Message-ID
<20110416014758.GB23306@sigill.intra.peff.net>
In-Reply-To
<7v7havckgg.fsf@alter.siamese.dyndns.org>
On Fri, Apr 15, 2011 at 01:45:35PM -0700, Junio C Hamano wrote:
Show 13 quoted lines
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
> 
> >> I can't think of a case where it matters, though, so maybe it is just
> >> paranoia.
> >
> > A line-counting, statistics tool would think that 1 line has been
> > removed from both branches, and one new added by the merge.
> >
> > Well, I know no tool parsing combined diff actually, so it's indeed a
> > hypothetical case.
> 
> And the ones that have been parsing cdiff wouldn't have done anything good
> before this change on such a binary blob anyway, no?

No, but we can view the proposed change as fixing a bug for such a tool Whereas turning it into:

  --Binary blob XXX
  + Binary blob YYY
   +Binary blob ZZZ
is codifying ambiguous output, and making the tool forever broken.
-Peff
Previous: Junio C HamanoNext: Junio C Hamano
Message 22 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.