From: Derrick Stolee <stolee@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>
Cc: Stefan Beller <sbeller@google.com>,
gitgitgadget@gmail.com, Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: Re: [PATCH 1/1] commit-graph: define GIT_TEST_COMMIT_GRAPH
Date: Wed, 29 Aug 2018 08:14:24 -0400 [thread overview]
Message-ID: <42329f9c-c4b5-f5fd-54cc-6b94b74574dc@gmail.com> (raw)
In-Reply-To: <CAPig+cSjanDi=jV75PdzYpAjwVgd4Suh3UyvY+Vy7yeHAuY8RA@mail.gmail.com>
On 8/28/2018 5:59 PM, Eric Sunshine wrote:
> On Tue, Aug 28, 2018 at 5:31 PM Derrick Stolee <stolee@gmail.com> wrote:
>> On 8/28/2018 4:41 PM, Stefan Beller wrote:
>>> On Tue, Aug 28, 2018 at 1:33 PM Derrick Stolee via GitGitGadget
>>> <gitgitgadget@gmail.com> wrote:
>>>> + GIT_TEST_COMMIT_GRAPH=0 &&
>>>> + test_must_fail git merge -m final G
>>> This could go on the same line without the && in between, setting the
>>> variable as a prefix.
>> It cannot! The Linux build I ran complained that you can't put
>> environment variables through test_must_fail.
> Is GIT_TEST_COMMIT_GRAPH exported? If not, it won't have an impact on
> git-merge anyhow.
In my testing this changed the behavior from fail to pass when passing
GIT_TEST_COMMIT_GRAPH=1 from the command.
> As for the special case of one-shot environment variable and
> test_must_fail(), you'll find "env" used as a workaround in a number
> of tests:
>
> test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge ... &&
Thanks for this! This is clearly the better solution.
-Stolee
next prev parent reply other threads:[~2018-08-29 12:14 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-28 20:33 [PATCH 0/1] Define GIT_TEST_COMMIT_GRAPH for commit-graph test coverage Derrick Stolee via GitGitGadget
2018-08-28 20:33 ` [PATCH 1/1] commit-graph: define GIT_TEST_COMMIT_GRAPH Derrick Stolee via GitGitGadget
2018-08-28 20:41 ` Stefan Beller
2018-08-28 21:31 ` Derrick Stolee
2018-08-28 21:59 ` Eric Sunshine
2018-08-29 12:14 ` Derrick Stolee [this message]
2018-10-08 13:43 ` Ævar Arnfjörð Bjarmason
2018-10-08 14:45 ` Derrick Stolee
2018-10-08 14:58 ` Ævar Arnfjörð Bjarmason
2018-10-08 15:01 ` Derrick Stolee
2018-10-09 5:53 ` Junio C Hamano
2018-08-28 20:37 ` [PATCH 0/1] Define GIT_TEST_COMMIT_GRAPH for commit-graph test coverage Stefan Beller
2018-08-28 21:32 ` Derrick Stolee
2018-08-29 12:49 ` [PATCH v2 " Derrick Stolee via GitGitGadget
2018-08-29 12:49 ` [PATCH v2 1/1] commit-graph: define GIT_TEST_COMMIT_GRAPH Derrick Stolee via GitGitGadget
2018-09-04 16:49 ` [PATCH v2 0/1] Define GIT_TEST_COMMIT_GRAPH for commit-graph test coverage Duy Nguyen
2018-09-04 17:12 ` Derrick Stolee
2018-09-04 17:18 ` Duy Nguyen
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=42329f9c-c4b5-f5fd-54cc-6b94b74574dc@gmail.com \
--to=stolee@gmail.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
--cc=sbeller@google.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.
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).