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

[PATCH 0/1] xdiff: share xdiff between git and libgit2

From
Edward Thomson <ethomson@edwardthomson.com>
Date
Feb 9, 2022, 01:29 UTC
Message-ID
<20220209012951.GA7@abe733c6e288>

Hello from libgit2, where we borrowed your xdiff a few years ago and have watched as we both hacked on it independently. (For us, mostly it was around tightening some things up around warnings and signed/unsigned mismatches.) However, we'd love to share a common xdiff implementation, and we're happy if git is the home for that.

The next patch adds an indirection point, `git-xdiff.h`, that contains the git-specific functionality in xdiff. This keeps the core of xdiff to standard functions. Other xdiff users, like libgit2, can specify their own compatibility functions in this header file.

I hope that this allows us to make progress on a common xdiff; we'd love to go back to building it without warnings, but we'd like to not do that in isolation.

Cheers- -ed

Edward Thomson (1):
  xdiff: provide indirection to git functions
 xdiff/git-xdiff.h | 14 ++++++++++++++
 xdiff/xdiff.h     |  8 +++-----
 xdiff/xdiffi.c    | 20 ++++++++++----------
 xdiff/xinclude.h  |  2 +-
 4 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100644 xdiff/git-xdiff.h

-- 2.35.0

Next: Edward Thomson
Message 1 of 11 in “xdiff: share xdiff between git and libgit2”
  1. 0/1 xdiff: share xdiff between git and libgit2Edward Thomson, Feb 9, 2022
  2. 1/1 xdiff: provide indirection to git functionsEdward Thomson, Feb 9, 2022
  3. Phillip WoodFeb 9, 2022
  4. Ævar Arnfjörð BjarmasonFeb 15, 2022
  5. Phillip WoodFeb 16, 2022
  6. Ævar Arnfjörð BjarmasonFeb 16, 2022
  7. Johannes SchindelinFeb 17, 2022
  8. Ævar Arnfjörð BjarmasonFeb 17, 2022
  9. Junio C HamanoFeb 17, 2022
  10. Edward ThomsonFeb 17, 2022
  11. Ævar Arnfjörð BjarmasonApr 15, 2022

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.