Re: [PATCH 3/3] read-cache: add index.version config variable

From: Eric Sunshine <sunshine@sunshineco.com>
Date: Feb 16, 2014, 02:10 UTC
Message-ID: <CAPig+cTAd4DL3WaCBJ82q5i-7EObER5BrQX92LQozeJqKTaOZQ@mail.gmail.com>
In-Reply-To: <1392492197-7724-4-git-send-email-t.gummerer@gmail.com>

On Sat, Feb 15, 2014 at 2:23 PM, Thomas Gummerer <t.gummerer@gmail.com> wrote:

Show 14 quoted lines

> Add a config variable that allows setting the default index version when
> initializing a new index file.  Similar to the GIT_INDEX_VERSION
> environment variable this only affects new index files.
>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---
> index 37fd84d..bf34985 100755
> --- a/t/t1600-index.sh
> +++ b/t/t1600-index.sh
> @@ -21,4 +21,31 @@ test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' '
>         )
>  '
>
> +test_expect_success 'out of bounds index.version issuses warning' '

s/issuses/issues/

Show 29 quoted lines

> +       (
> +               unset GIT_INDEX_VERSION &&
> +               rm .git/index &&
> +               git config --add index.version 1 &&
> +               git add a 2>&1 | sed "s/[0-9]//" >actual.err &&
> +               sed -e "s/ Z$/ /" <<-\EOF >expect.err &&
> +                       warning: index.version set, but the value is invalid.
> +                       Using version Z
> +               EOF
> +               test_i18ncmp expect.err actual.err
> +       )
> +'
> +
> +test_expect_success 'GIT_INDEX_VERSION takes precedence over config' '
> +       (
> +               rm .git/index &&
> +               GIT_INDEX_VERSION=4 &&
> +               export GIT_INDEX_VERSION &&
> +               git config --add index.version 2 &&
> +               git add a 2>&1 &&
> +               echo 4 >expect &&
> +               test-index-version <.git/index >actual &&
> +               test_cmp expect actual
> +       )
> +'
> +
>  test_done
> --
> 1.8.5.2.300.ge613be6.dirty