git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Edward Thomson <ethomson@edwardthomson.com>
To: git@vger.kernel.org
Cc: johannes.schindelin@gmx.de
Subject: [PATCH 0/1] xdiff: share xdiff between git and libgit2
Date: Wed, 9 Feb 2022 01:29:51 +0000	[thread overview]
Message-ID: <20220209012951.GA7@abe733c6e288> (raw)

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


             reply	other threads:[~2022-02-09  2:41 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-09  1:29 Edward Thomson [this message]
2022-02-09  1:33 ` [PATCH 1/1] xdiff: provide indirection to git functions Edward Thomson
2022-02-09 11:07   ` Phillip Wood
2022-02-15 23:40   ` Ævar Arnfjörð Bjarmason
2022-02-16 11:02     ` Phillip Wood
2022-02-16 13:27       ` Ævar Arnfjörð Bjarmason
     [not found]         ` <20220217012847.GA8@e5e602f6ad40>
2022-02-17  9:29           ` Ævar Arnfjörð Bjarmason
2022-02-17 17:32             ` Junio C Hamano
2022-02-17 22:58             ` Edward Thomson
2022-04-15 15:55               ` Ævar Arnfjörð Bjarmason
2022-02-17 15:44 ` [PATCH 0/1] xdiff: share xdiff between git and libgit2 Johannes Schindelin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220209012951.GA7@abe733c6e288 \
    --to=ethomson@edwardthomson.com \
    --cc=git@vger.kernel.org \
    --cc=johannes.schindelin@gmx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).