Re: [PATCH 1/1] commit-graph: define GIT_TEST_COMMIT_GRAPH

On 8/28/2018 5:59 PM, Eric Sunshine wrote:

On Tue, Aug 28, 2018 at 5:31 PM Derrick Stolee [off-list ref] wrote:

quoted

On 8/28/2018 4:41 PM, Stefan Beller wrote:

quoted

On Tue, Aug 28, 2018 at 1:33 PM Derrick Stolee via GitGitGadget
[off-list ref] wrote:

quoted

+               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