From: Junio C Hamano <gitster@pobox•com>
To: Christian Couder <christian.couder@gmail•com>
Cc: git@vger•kernel.org, "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>,
"Michael Haggerty" <mhagger@alum•mit.edu>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail•com>,
"Ramsay Jones" <ramsay@ramsayjones•plus.com>,
"Christian Couder" <chriscool@tuxfamily•org>
Subject: Re: [PATCH v2 3/3] t1700: make sure split-index respects core.sharedrepository
Date: Fri, 23 Jun 2017 15:20:10 -0700 [thread overview]
Message-ID: <xmqqwp82bb39.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <20170623151640.24082-3-chriscool@tuxfamily.org> (Christian Couder's message of "Fri, 23 Jun 2017 17:16:40 +0200")
Christian Couder <christian.couder@gmail•com> writes:
> Add a few tests to check that both the split-index file and the
> shared-index file are created using the right permissions when
> core.sharedrepository is set.
>
> Signed-off-by: Christian Couder <chriscool@tuxfamily•org>
> ---
> t/t1700-split-index.sh | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
>
> diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
> index af3ec0da5a..2c5be732e4 100755
> --- a/t/t1700-split-index.sh
> +++ b/t/t1700-split-index.sh
> @@ -370,4 +370,21 @@ test_expect_success 'check splitIndex.sharedIndexExpire set to "never" and "now"
> test $(ls .git/sharedindex.* | wc -l) -le 2
> '
>
> +while read -r mode modebits filename; do
Style.
while read -r mode modebits filename
do
> + test_expect_success POSIXPERM "split index respects core.sharedrepository $mode" '
> + git config core.sharedrepository "$mode" &&
> + : >"$filename" &&
> + git update-index --add "$filename" &&
> + echo "$modebits" >expect &&
> + test_modebits .git/index >actual &&
> + test_cmp expect actual &&
> + newest_shared_index=$(ls -t .git/sharedindex.* | head -1) &&
> + test_modebits "$newest_shared_index" >actual &&
> + test_cmp expect actual
> + '
Running this twice in a loop would create two .git/sharedindex.*
files in quick succession. I do not think we want to assume that
the filesystem timestamp can keep up with us to allow "ls -t" to
work reliably in the second round (if there is a leftover shared
index from previous test, even the first round may not catch the
latest one).
How about doing each iteration this way instead? Which might be a
better solution to work around that.
- with core.sharedrepository set to false, force the index to be
unsplit; "index" will have the default unshared permission
bits (but we do not care what it is and no need to check it).
- remove any leftover sharedindex.*, if any.
- with core.sharedrepository set to whatever mode being tested,
do the adding to force split.
- test the permission of index file.
- test the permission of sharedindex.* file; there should be
only one instance, so erroring out when we see two or more is
also a good test.
The last two steps may look like:
test_modebits .git/index >actual && test_cmp expect actual &&
shared=$(ls .git/sharedindex.*) &&
case "$shared" in
*" "*)
# we have more than one???
false ;;
*)
test_modebits "shared" >actual &&
test_cmp expect actual ;;
esac
> +done <<\EOF
> +0666 -rw-rw-rw- seventeen
> +0642 -rw-r---w- eightteen
> +EOF
> +
> test_done
next prev parent reply other threads:[~2017-06-23 22:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-23 15:16 [PATCH v2 1/3] read-cache: use shared perms when writing shared index Christian Couder
2017-06-23 15:16 ` [PATCH v2 2/3] t1301: move modebits() to test-lib-functions.sh Christian Couder
2017-06-23 15:16 ` [PATCH v2 3/3] t1700: make sure split-index respects core.sharedrepository Christian Couder
2017-06-23 22:20 ` Junio C Hamano [this message]
2017-06-25 4:39 ` Christian Couder
2017-06-23 21:55 ` [PATCH v2 1/3] read-cache: use shared perms when writing shared index Junio C Hamano
2017-06-23 22:02 ` Junio C Hamano
2017-06-25 4:42 ` Christian Couder
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=xmqqwp82bb39.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=christian.couder@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=mhagger@alum$(echo .)mit.edu \
--cc=pclouds@gmail$(echo .)com \
--cc=ramsay@ramsayjones$(echo .)plus.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