From: Emily Shaffer <firstname.lastname@example.org>
To: Elijah Newren <email@example.com>
Cc: Junio C Hamano <firstname.lastname@example.org>,
Git Mailing List <email@example.com>
Subject: Re: [PATCH 1/1] merge-recursive: avoid directory rename detection in recursive case
Date: Tue, 6 Aug 2019 14:54:46 -0700 [thread overview]
Message-ID: <20190806215446.GA59629@google.com> (raw)
> > > +
> > > + test_i18ngrep ! CONFLICT out &&
> > > + test_i18ngrep ! BUG: err &&
> > The BUG is gone. But should it not use i18ngrep? BUG() isn't localized.
> Technically, yes, you're right. However, this line's purpose isn't
> correctness of the test but documentation for the person reading the
> testcase about what it's real original purpose was; my real test was
> the "test_must_be_empty err" check I have below it, but I added this
> line just to document the intent better. I kind of like the
> "CONFLICT" and "BUG" lines looking similar just so the reader of the
> testcase doesn't have to try to reason through why they are different,
> although I guess it does present the problem that more careful readers
> like yourself might do a double take.
> If folks find it more readable to use regular grep instead of
> test_i18ngrep, I can change this line as well as the "core dumped"
> check immediately below over to regular grep.
It's fine by me, I see your point.
> Thanks for taking a look. :-)
Reviewed-by: Emily Shaffer <firstname.lastname@example.org>
next prev parent reply other threads:[~2019-08-06 21:54 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 22:09 BUG() during criss-cross merge with directory rename and deleted file Emily Shaffer
2019-08-05 22:33 ` [PATCH 1/1] merge-recursive: avoid directory rename detection in recursive case Elijah Newren
2019-08-06 16:57 ` Junio C Hamano
2019-08-06 17:26 ` Elijah Newren
2019-08-06 17:49 ` Junio C Hamano
2019-08-06 17:26 ` Junio C Hamano
2019-08-06 17:29 ` Elijah Newren
2019-08-06 20:28 ` Emily Shaffer
2019-08-06 21:16 ` Elijah Newren
2019-08-06 21:54 ` Emily Shaffer [this message]
2019-08-08 11:00 ` Jeff King
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:
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 \
* 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
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).