From: Seth House <seth@eseth.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "brian m. carlson" <sandals@crustytoothpaste.net>,
Junio C Hamano <gitster@pobox.com>,
David Aguilar <davvid@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
git@vger.kernel.org
Subject: Re: Re* [PATCH v2] fixup! mergetool: add automerge configuration
Date: Tue, 26 Jan 2021 11:06:35 -0700 [thread overview]
Message-ID: <20210126180635.GA28241@ellen> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2101261522200.57@tvgsbejvaqbjf.bet>
On Tue, Jan 26, 2021 at 03:32:13PM +0100, Johannes Schindelin wrote:
> So I'd rather see `git mergetool` be turned into a portable C program, or
> alternatively using a built-in helper that _is_ written in C, to perform
> that desired text munging
I tend to agree. Though my personal preference is Cygwin's (eventual)
approach, I can appreciate the arguments made by the MSYS2 folk. But
setting that aside, IMO, the ideal place to handle this would be the
same place where the conflict markers are written in the first place,
xmerge.c if my limited C literacy is correct.
I don't see a big distinction between writing a single file with
conflict markers and writing two, diff-able files with each "side" of
the conflict -- they're ultimately two different formats for expressing
the same information. That would give us the portability you described
and the (pretty amazing) performance that merge-file already enjoys. :)
I'm more than happy with calling merge-file twice for now. A future
C optimisation, perhaps exposed via merge-file as a new (e.g.)
--write-conflict-files flag, would be even more awesome.
next prev parent reply other threads:[~2021-01-26 22:08 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-09 21:49 [PATCH] fixup! mergetool: add automerge configuration David Aguilar
2021-01-09 21:59 ` brian m. carlson
2021-01-09 22:42 ` [PATCH v2] " David Aguilar
2021-01-09 22:54 ` Seth House
2021-01-10 1:17 ` Junio C Hamano
2021-01-10 6:40 ` Re* " Junio C Hamano
2021-01-10 7:29 ` Seth House
2021-01-10 11:24 ` Junio C Hamano
2021-01-16 4:24 ` Seth House
2021-01-20 23:24 ` automerge implementation ideas for Windows Seth House
2021-01-21 22:50 ` Junio C Hamano
2021-01-22 1:09 ` Seth House
2021-01-22 2:26 ` Junio C Hamano
2021-01-22 2:50 ` Re* [PATCH v2] fixup! mergetool: add automerge configuration brian m. carlson
2021-01-22 16:29 ` Johannes Schindelin
2021-01-22 23:25 ` brian m. carlson
2021-01-26 14:32 ` Johannes Schindelin
2021-01-26 18:06 ` Seth House [this message]
2021-01-26 20:10 ` Junio C Hamano
2021-01-27 3:37 ` Seth House
2021-01-29 0:41 ` Junio C Hamano
2021-01-09 23:18 ` Junio C Hamano
2021-01-10 1:52 ` Junio C Hamano
2021-01-09 23:21 ` [PATCH] " Junio C Hamano
2021-01-22 9:08 Re* [PATCH v2] " Seth House
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=20210126180635.GA28241@ellen \
--to=seth@eseth.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=davvid@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sandals@crustytoothpaste.net \
/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).