From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Michael J Gruber" <git@grubix.eu>,
git@vger.kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [PATCH] t3701: two subtests are fixed
Date: Tue, 21 Jun 2022 08:45:04 -0700 [thread overview]
Message-ID: <xmqq8rpqja0v.fsf@gitster.g> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.2206181342200.349@tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Sat, 18 Jun 2022 13:55:24 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>> in config.mak. Nothing else strikes me as potentially relevant.
>>
>> Ævar noticed this and has a better version of my patch, I think.
>
> So you did not find it utterly rude and presumptuous that somebody sent a
> new iteration of your patch without even so much as consulting with you
> whether you're okay with this? I salute your forbearance, then.
I had an impression that these (wasn't there another one) were
independent discoveries and patching that happened at the same time.
> Besides, it is not really a better version of your patch. That would have
> been:
>
> -- snip --
> diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
> index 94537a6b40a..6d1032fe8ae 100755
> --- a/t/t3701-add-interactive.sh
> +++ b/t/t3701-add-interactive.sh
> @@ -538,7 +538,9 @@ test_expect_success 'split hunk "add -p (edit)"' '
> ! grep "^+15" actual
> '
>
> -test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
> +test_lazy_prereq BUILTIN_ADD_I 'test_bool_env GIT_TEST_ADD_I_USE_BUILTIN true'
> +
> +test_expect_success BUILTIN_ADD_I 'split hunk "add -p (no, yes, edit)"' '
> test_write_lines 5 10 20 21 30 31 40 50 60 >test &&
> git reset &&
> # test sequence is s(plit), n(o), y(es), e(dit)
Prerequisite lets you skip.
This stops saying that "with scripted version 'add -p' does not
behave in the way we want to see, and we want to leave us a mental
note about it". I do not know if that is what we want.
Once scripted version gets fully retired, it of course stops
mattering ;-)
> @@ -562,7 +564,7 @@ test_expect_success 'split hunk with incomplete line at end' '
> test_must_fail git grep --cached before
> '
>
> -test_expect_failure 'edit, adding lines to the first hunk' '
> +test_expect_failure BUILTIN_ADD_I 'edit, adding lines to the first hunk' '
I am not sure if this is a good change, quite honestly. With
s/failure/success/, perhaps, but not in the posted form.
next prev parent reply other threads:[~2022-06-21 15:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 15:26 [PATCH] t3701: two subtests are fixed Michael J Gruber
2022-06-14 15:40 ` [PATCH v2] add -i tests: mark "TODO" depending on GIT_TEST_ADD_I_USE_BUILTIN Ævar Arnfjörð Bjarmason
2022-06-15 2:47 ` Todd Zullinger
2022-06-16 10:16 ` Ævar Arnfjörð Bjarmason
2022-06-16 13:47 ` Todd Zullinger
2022-06-14 15:48 ` [PATCH] t3701: two subtests are fixed Derrick Stolee
2022-06-15 1:25 ` Todd Zullinger
2022-06-15 1:55 ` Taylor Blau
2022-06-15 14:50 ` Johannes Schindelin
2022-06-16 9:14 ` Michael J Gruber
2022-06-16 16:50 ` Junio C Hamano
2022-06-18 11:55 ` Johannes Schindelin
2022-06-21 15:45 ` Junio C Hamano [this message]
2022-06-22 8:24 ` Michael J Gruber
2022-06-23 15:55 ` Johannes Schindelin
2022-06-23 16:33 ` 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=xmqq8rpqja0v.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@grubix.eu \
--cc=git@vger.kernel.org \
/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).