From: Edward Thomson <ethomson@edwardthomson.com>
To: git@vger.kernel.org
Cc: johannes.schindelin@gmx.de,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH v2 0/1] xdiff: provide indirection to git functions
Date: Thu, 17 Feb 2022 22:52:18 +0000 [thread overview]
Message-ID: <20220217225218.GA7@edef91d97c94> (raw)
Hello (again) from libgit2; this is a v2 of changes to xdiff to allow
us to work together more easily. As discussed in the previous patch
(https://lore.kernel.org/git/20220209012951.GA7@abe733c6e288/) this
adds a simple abstraction layer in `git-xdiff.h`.
Other xdiff users, like libgit2, can specify their own compatibility
functions in this header file.
Cheers-
-ed
Edward Thomson (1):
xdiff: provide indirection to git functions
xdiff/git-xdiff.h | 16 ++++++++++++++++
xdiff/xdiff.h | 8 +++-----
xdiff/xdiffi.c | 20 ++++++++++----------
xdiff/xinclude.h | 2 +-
xdiff/xmerge.c | 4 ++--
5 files changed, 32 insertions(+), 18 deletions(-)
create mode 100644 xdiff/git-xdiff.h
--
2.35.1
next reply other threads:[~2022-02-17 22:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 22:52 Edward Thomson [this message]
2022-02-17 22:54 ` [PATCH v2 1/1] xdiff: provide indirection to git functions Edward Thomson
2022-02-22 11:14 ` Phillip Wood
2022-02-25 15:41 ` Johannes Schindelin
2022-02-25 18:24 ` Junio C Hamano
2022-02-25 18:38 ` Edward Thomson
2022-02-25 18:58 ` Junio C Hamano
2022-02-25 19:03 ` Junio C Hamano
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=20220217225218.GA7@edef91d97c94 \
--to=ethomson@edwardthomson.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=phillip.wood123@gmail.com \
/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).