Re: [PATCH v3 0/6] Fix the racy split index problem

From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Sep 30, 2018, 14:47 UTC
Message-ID: <20180930144731.GJ23446@localhost>
In-Reply-To: <20180928162459.17138-1-szeder.dev@gmail.com>

Junio,

On Fri, Sep 28, 2018 at 06:24:53PM +0200, SZEDER Gábor wrote:

Show 9 quoted lines

> Interdiff:
> diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
> index c8acbc50d0..f053bf83eb 100755
> --- a/t/t1700-split-index.sh
> +++ b/t/t1700-split-index.sh
> @@ -6,6 +6,9 @@ test_description='split index mode tests'
>  
>  # We need total control of index splitting here
>  sane_unset GIT_TEST_SPLIT_INDEX

The conflict resolution around here in 3f725b07d3 (Merge branch 'sg/split-index-racefix' into jch, 2018-09-29) accidentally removed the above line, which makes the test fail when run with 'GIT_TEST_SPLIT_INDEX=yes', e.g.:

  https://travis-ci.org/git/git/jobs/435077629#L3389

Show 6 quoted lines

> +# A couple of tests expect the index to have a specific checksum,
> +# but the presence of the optional FSMN extension would interfere
> +# with those checks, so disable it in this test script.
>  sane_unset GIT_FSMONITOR_TEST
>  
>  # Create a file named as $1 with content read from stdin.