From: Junio C Hamano <gitster@pobox.com>
To: Seth House <seth@eseth.com>
Cc: David Aguilar <davvid@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
git@vger.kernel.org
Subject: Re: [PATCH v2] fixup! mergetool: add automerge configuration
Date: Sat, 09 Jan 2021 17:17:22 -0800 [thread overview]
Message-ID: <xmqqmtxhd1zx.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20210109225400.GA156779@ellen> (Seth House's message of "Sat, 9 Jan 2021 15:54:00 -0700")
Seth House <seth@eseth.com> writes:
> On Sat, Jan 09, 2021 at 02:42:36PM -0800, David Aguilar wrote:
>> Replace "\r" with a substituted variable that contains "\r".
>> Replace "\?" with "\{0,1\}".
>
> Nice. I was (very slowly) converging on that as the culprit. Thanks for
> the elegant fix! I'm running the test suite on Windows and OSX (now that
> they're set up locally) with this included and I'll send a v10 once
> complete.
Note that the topic fails t7800.5 even with the fix-up (and without
these fix-up on a platform with sed that do not need the portability
fix-up).
next prev parent reply other threads:[~2021-01-10 1:19 UTC|newest]
Thread overview: 24+ 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 [this message]
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
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
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmtxhd1zx.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=davvid@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
--cc=seth@eseth.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).