From: Thomas Gummerer <t.gummerer@gmail•com>
To: Junio C Hamano <gitster@pobox•com>
Cc: git@vger•kernel.org, pclouds@gmail•com, sunshine@sunshineco•com
Subject: Re: [PATCH v2 0/3] Easier access to index-v4
Date: Mon, 24 Feb 2014 20:53:14 +0100 [thread overview]
Message-ID: <87y510s2xh.fsf@hank.lan> (raw)
In-Reply-To: <xmqqwqgk8fsq.fsf@gitster.dls.corp.google.com>
Junio C Hamano <gitster@pobox•com> writes:
> Junio C Hamano <gitster@pobox•com> writes:
>
>> Thomas Gummerer <t.gummerer@gmail•com> writes:
>>
>>> previous round was at $gmane/242198.
>>>
>>> Since then I've squashed the fixes suggested by Junio, added a test
>>> showing what should happen if an index file is present and
>>> GIT_INDEX_VERSION is set and fixed the typo found by Eric.
>>
>> Looks good; thanks.
>
> Tests, seem to leak these unnecessary diag (not limited to t0010).
>
> sh t0010-racy-git.sh
> warning: GIT_INDEX_VERSION set, but the value is invalid.
> Using version 3
> ok 1 - Racy GIT trial #0 part A
> ok 2 - Racy GIT trial #0 part B
> warning: GIT_INDEX_VERSION set, but the value is invalid.
> Using version 3
> ...
> # passed all 10 test(s)
> 1..10
>
>
> The same thing under prove.
>
> *** prove ***
> t0010-racy-git.sh .. warning: GIT_INDEX_VERSION set, but the value is invalid.
> Using version 3
> t0010-racy-git.sh .. 2/? warning: GIT_INDEX_VERSION set, but the value is invalid.
> Using version 3
> t0010-racy-git.sh .. 4/? warning: GIT_INDEX_VERSION set, but the value is invalid.
> Using version 3
> t0010-racy-git.sh .. 6/? warning: GIT_INDEX_VERSION set, but the value is invalid.
> Using version 3
> t0010-racy-git.sh .. 8/? warning: GIT_INDEX_VERSION set, but the value is invalid.
> Using version 3
> t0010-racy-git.sh .. ok
> All tests successful.
>
>
> I suspect the real culprit is the early part in test-lib.sh that
> sets GIT_INDEX_VERSION explicitly from TEST_GIT_INDEX_VERSION when
> the latter is not even specified.
>
> Something along this line, perhaps?
Sorry about this, I didn't run the test suite without
TEST_GIT_INDEX_VERSION in config.mak which I obviously should have.
Yes, this looks good to me, thanks!
> t/test-lib.sh | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 492f81f..01a98cb 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -108,8 +108,11 @@ export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
> export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
> export EDITOR
>
> -GIT_INDEX_VERSION="$TEST_GIT_INDEX_VERSION"
> -export GIT_INDEX_VERSION
> +if test -n "${TEST_GIT_INDEX_VERSION+isset}"
> +then
> + GIT_INDEX_VERSION="$TEST_GIT_INDEX_VERSION"
> + export GIT_INDEX_VERSION
> +fi
>
> # Add libc MALLOC and MALLOC_PERTURB test
> # only if we are not executing the test with valgrind
next prev parent reply other threads:[~2014-02-24 19:53 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-23 20:49 [PATCH v2 0/3] Easier access to index-v4 Thomas Gummerer
2014-02-23 20:49 ` [PATCH v2 1/3] introduce GIT_INDEX_VERSION environment variable Thomas Gummerer
2014-02-23 20:49 ` [PATCH v2 2/3] test-lib: allow setting the index format version Thomas Gummerer
2014-02-23 20:49 ` [PATCH v2 3/3] read-cache: add index.version config variable Thomas Gummerer
2014-02-24 17:56 ` [PATCH v2 0/3] Easier access to index-v4 Junio C Hamano
2014-02-24 19:35 ` Junio C Hamano
2014-02-24 19:53 ` Thomas Gummerer [this message]
2014-02-24 21:39 ` Junio C Hamano
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=87y510s2xh.fsf@hank.lan \
--to=t.gummerer@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=pclouds@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox