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

Re: symling diff driver (Was: Re: git diff: add option for omitting the contents of deletes)

From
Jeff King <peff@peff.net>
Date
Feb 28, 2011, 13:08 UTC
Message-ID
<20110228130850.GB9054@sigill.intra.peff.net>
In-Reply-To
<4D6B981E.5090206@drmicha.warpmail.net>
On Mon, Feb 28, 2011 at 01:42:06PM +0100, Michael J Gruber wrote:
Show 6 quoted lines
> > I am still carrying around my "symlinks as a special class of diff"
> > patches if you are interested:
> > 
> >   https://github.com/peff/git/tree/jk/userdiff-symlinks
> 
> This is marvelous (except for s/perl -pe/sed -e/, of course).

I used perl because many older seds have trouble with files not ending in newline.

> Is there anything left to do to get this in pu? (The reference to
> "previous patch" may need to be more explicit.)
See this subthread for discussion:
  http://article.gmane.org/gmane.comp.version-control.git/156760

On the one hand, there were doubts that anybody would actually want to use it (though it looks like you may be the counterexample to that). On the other hand, it may be that the solution does not go far enough, and that .gitattributes should become aware of file types in its matching. That would be more flexible, and it would also fix other broken areas (like the fact that a symlink to foo.pdf might have its symlink text merged as if it were a pdf).

-Peff
Previous: Michael J GruberNext: Michael J Gruber
Message 26 of 32 in “git diff: add option for omitting the contents of deletes”
  1. Mart SõmermaaFeb 26, 2011
  2. Junio C HamanoFeb 26, 2011
  3. Michael J GruberFeb 27, 2011
  4. Mart SõmermaaFeb 27, 2011
  5. Michael J GruberFeb 28, 2011
  6. Mart SõmermaaFeb 28, 2011
  7. Junio C HamanoFeb 27, 2011
  8. Junio C HamanoFeb 27, 2011
  9. Michael J GruberFeb 28, 2011
  10. Jeff KingFeb 28, 2011
  11. Jeff KingFeb 28, 2011
  12. Michael J GruberFeb 28, 2011
  13. Jeff KingFeb 28, 2011
  14. Michael J GruberFeb 28, 2011
  15. Jeff KingFeb 28, 2011
  16. Junio C HamanoFeb 28, 2011
  17. Jeff KingFeb 28, 2011
  18. Junio C HamanoFeb 28, 2011
  19. Junio C HamanoMar 1, 2011
  20. Mart SõmermaaMar 7, 2011
  21. Michael J GruberMar 8, 2011
  22. Junio C HamanoMar 8, 2011
  23. Mart SõmermaaMar 8, 2011
  24. Jeff KingMar 8, 2011
  25. symling diff driver (Was: Re: git diff: add option for omitting the contents of deletes)Michael J Gruber, Feb 28, 2011
  26. Jeff KingFeb 28, 2011
  27. attr: make attributes depend on file typeMichael J Gruber, Feb 28, 2011
  28. Jeff KingFeb 28, 2011
  29. Junio C HamanoFeb 28, 2011
  30. Michael J GruberMar 1, 2011
  31. Mart SõmermaaFeb 28, 2011
  32. Michael J GruberFeb 28, 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.