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

JGIT: discuss: diff/patch implementation

From
FGFrancis Galiegue <fg@one2team.net>
Date
Nov 10, 2008, 14:22 UTC
Message-ID
<200811101522.13558.fg@one2team.net>
Hello,

A very nice git feature, without even going as far as merges, is the cherry pick feature.

For this to be doable from within the Eclipse Git plugin, a diff/patch implementation needs to be found, in a license compatible with the current JGit license (3-clause BSD, as far as I can tell). Or a new implementation can be rewritten from scratch, of course.

I found this:
http://code.google.com/p/google-diff-match-patch

Its license is the Apache 2.0 license. It implements the same algorithm than git's internal diff engine ("An O(ND) Difference Algorithm and its Variations", by Eugene Myers), and as far as I can tell so far (IANAL, far from it), it is compatible with JGit's current license.

Could this be a viable candidate?
-- 
fge
Next: Robin Rosenberg
Message 1 of 16 in “JGIT: discuss: diff/patch implementation”
  1. Francis GaliegueNov 10, 2008
  2. Robin RosenbergNov 10, 2008
  3. Francis GaliegueNov 10, 2008
  4. Robin RosenbergNov 10, 2008
  5. Francis GaliegueNov 10, 2008
  6. Johannes SchindelinNov 10, 2008
  7. Francis GaliegueNov 10, 2008
  8. Junio C HamanoNov 10, 2008
  9. Shawn O. PearceNov 10, 2008
  10. Francis GaliegueNov 10, 2008
  11. Johannes SchindelinNov 10, 2008
  12. Raimund BauerNov 11, 2008
  13. Shawn O. PearceNov 11, 2008
  14. Sverre RabbelierNov 11, 2008
  15. Rogan DawesNov 11, 2008
  16. Shawn O. PearceNov 11, 2008

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.