From: Ben Peart <peartben@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>,
Elijah Newren <newren@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Ben Peart <benpeart@microsoft.com>,
kewillf@microsoft.com
Subject: Re: [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout
Date: Mon, 23 Jul 2018 09:12:51 -0400 [thread overview]
Message-ID: <b56598a1-e543-500a-a39b-cee07fe1e533@gmail.com> (raw)
In-Reply-To: <CAPig+cTjQ74gOt8gJbYUBaTRsHBvqtcmucoVdiudFt2TrhCn+g@mail.gmail.com>
On 7/21/2018 3:21 AM, Eric Sunshine wrote:
> On Sat, Jul 21, 2018 at 2:34 AM Elijah Newren <newren@gmail.com> wrote:
>> diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
>> @@ -392,4 +392,17 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
>> +test_expect_failure 'failed cherry-pick with sparse-checkout' '
>> + pristine_detach initial &&
>> + git config core.sparseCheckout true &&
>
> Should this be test_config()?
>
I think using test_config() here is fine but...
>> + echo /unrelated >.git/info/sparse-checkout &&
>> + git read-tree --reset -u HEAD &&
>> + test_must_fail git cherry-pick -Xours picked>actual &&
>> + test_i18ngrep ! "Changes not staged for commit:" actual &&
>> + echo "/*" >.git/info/sparse-checkout &&
>> + git read-tree --reset -u HEAD &&
>> + git config core.sparseCheckout false &&
>
> See question above.
>
>> + rm .git/info/sparse-checkout
>
> Should this cleanup be done by test_when_finished()?
>
I think trying to use test_when_finished() for this really degrades the
readability of the test. See below:
test_expect_success 'failed cherry-pick with sparse-checkout' '
pristine_detach initial &&
test_config core.sparsecheckout true &&
echo /unrelated >.git/info/sparse-checkout &&
git read-tree --reset -u HEAD &&
test_when_finished "echo \"/*\" >.git/info/sparse-checkout && git
read-tree --reset -u HEAD && rm .git/info/sparse-checkout" &&
test_must_fail git cherry-pick -Xours picked>actual &&
test_i18ngrep ! "Changes not staged for commit:" actual
'
Given it takes multiple commands, I'd prefer to keep the setup and
cleanup of the sparse checkout settings symmetrical.
next prev parent reply other threads:[~2018-07-23 13:12 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-20 19:53 [BUG] merge-recursive overly aggressive when skipping updating the working tree Ben Peart
2018-07-20 20:48 ` Elijah Newren
2018-07-20 21:13 ` Junio C Hamano
2018-07-20 21:42 ` Elijah Newren
2018-07-20 22:05 ` Junio C Hamano
2018-07-20 23:02 ` Elijah Newren
2018-07-23 12:49 ` Ben Peart
2018-07-21 6:34 ` [PATCH 0/2] Preserve skip_worktree bit in merges when necessary Elijah Newren
2018-07-21 6:34 ` [PATCH 1/2] t3507: add a testcase showing failure with sparse checkout Elijah Newren
2018-07-21 7:21 ` Eric Sunshine
2018-07-23 13:12 ` Ben Peart [this message]
2018-07-23 18:09 ` Eric Sunshine
2018-07-23 18:22 ` Ben Peart
2018-07-21 13:02 ` Ben Peart
2018-07-23 18:12 ` Junio C Hamano
2018-07-21 6:34 ` [PATCH 2/2] merge-recursive: preserve skip_worktree bit when necessary Elijah Newren
2018-07-23 14:14 ` Ben Peart
2018-07-27 12:59 ` [PATCH v2 0/2] Preserve skip_worktree bit in merges " Ben Peart
2018-07-27 12:59 ` [PATCH v2 1/2] t3507: add a testcase showing failure with sparse checkout Ben Peart
2018-07-27 12:59 ` [PATCH v2 2/2] merge-recursive: preserve skip_worktree bit when necessary Ben Peart
2018-07-27 18:14 ` [PATCH v2 0/2] Preserve skip_worktree bit in merges " Junio C Hamano
2018-07-31 16:11 ` Elijah Newren
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=b56598a1-e543-500a-a39b-cee07fe1e533@gmail.com \
--to=peartben@gmail.com \
--cc=benpeart@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kewillf@microsoft.com \
--cc=newren@gmail.com \
--cc=sunshine@sunshineco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.