From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v2 11/22] t5302: make hash size independent
Date: Sun, 26 Jan 2020 23:23:32 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2001262315150.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <20200125230035.136348-12-sandals@crustytoothpaste.net>
Hi brian,
On Sat, 25 Jan 2020, brian m. carlson wrote:
> Compute the length of object IDs and pack offsets instead of hard-coding
> constants.
>
> Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
> ---
> t/t5302-pack-index.sh | 18 +++++++++++-------
> 1 file changed, 11 insertions(+), 7 deletions(-)
>
> diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
> index 91d51b35f9..93ac003639 100755
> --- a/t/t5302-pack-index.sh
> +++ b/t/t5302-pack-index.sh
> @@ -8,7 +8,8 @@ test_description='pack index with 64-bit offsets and object CRC'
>
> test_expect_success \
> 'setup' \
> - 'rm -rf .git &&
> + 'test_oid_init &&
> + rm -rf .git &&
Why not consolidate the `test_expect_success` line into the current
convention at the same time ("while at it")? I.e.
test_expect_success 'setup' '
> git init &&
> git config pack.threads 1 &&
> i=1 &&
> @@ -32,7 +33,9 @@ test_expect_success \
> echo $tree &&
> git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\) .*/\\1/"
> } >obj-list &&
> - git update-ref HEAD $commit'
> + git update-ref HEAD $commit &&
> + rawsz=$(test_oid rawsz)
Since the `rawsz` assignment has a lot to do with `test_oid_init`, I would
coddle this added line with the `test_oid_init` line above instead of
adding it here.
> +'
>
> test_expect_success \
> 'pack-objects with index version 1' \
> @@ -152,6 +155,7 @@ test_expect_success \
> '[index v1] 2) create a stealth corruption in a delta base reference' \
> '# This test assumes file_101 is a delta smaller than 16 bytes.
> # It should be against file_100 but we substitute its base for file_099
> + offset=$((rawsz + 4)) &&
> sha1_101=$(git hash-object file_101) &&
> sha1_099=$(git hash-object file_099) &&
> offs_101=$(index_obj_offset 1.idx $sha1_101) &&
> @@ -159,8 +163,8 @@ test_expect_success \
> chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
> dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
> if=".git/objects/pack/pack-${pack1}.idx" \
> - skip=$((4 + 256 * 4 + $nr_099 * 24)) \
> - bs=1 count=20 conv=notrunc &&
> + skip=$((4 + 256 * 4 + $nr_099 * offset)) \
> + bs=1 count=$rawsz conv=notrunc &&
Similarly, the `offset` variable is only used here, so I would assign it
just before the `dd` call. The name `offset` might be a bit to generic not
to be reused, either, maybe `recordsz` or `index_entry_size` or `entrysz`?
Apart from that, the patch looks obviously good to me.
Ciao,
Dscho
P.S.: I'll stop reviewing here for now (It is not that I am tired of
looking at your patches, it is that I am just tired).
> git cat-file blob $sha1_101 > file_101_foo1'
>
> test_expect_success \
> @@ -200,8 +204,8 @@ test_expect_success \
> chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
> dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
> if=".git/objects/pack/pack-${pack1}.idx" \
> - skip=$((8 + 256 * 4 + $nr_099 * 20)) \
> - bs=1 count=20 conv=notrunc &&
> + skip=$((8 + 256 * 4 + $nr_099 * rawsz)) \
> + bs=1 count=$rawsz conv=notrunc &&
> git cat-file blob $sha1_101 > file_101_foo2'
>
> test_expect_success \
> @@ -226,7 +230,7 @@ test_expect_success \
> nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
> chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
> printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
> - bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * 20 + $nr * 4)) &&
> + bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
> ( while read obj
> do git cat-file -p $obj >/dev/null || exit 1
> done <obj-list ) &&
>
next prev parent reply other threads:[~2020-01-26 22:23 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-25 23:00 [PATCH v2 00/23] SHA-256 test fixes, part 8 brian m. carlson
2020-01-25 23:00 ` [PATCH v2 01/22] t/lib-pack: support SHA-256 brian m. carlson
2020-01-25 23:00 ` [PATCH v2 02/22] t3206: make hash size independent brian m. carlson
2020-01-25 23:00 ` [PATCH v2 03/22] t3305: annotate with SHA1 prerequisite brian m. carlson
2020-01-26 11:15 ` Johannes Schindelin
2020-01-26 18:18 ` Johan Herland
2020-01-26 21:28 ` Johannes Schindelin
2020-01-26 21:50 ` brian m. carlson
2020-01-26 23:57 ` Johan Herland
2020-01-27 12:22 ` Johannes Schindelin
2020-01-26 19:44 ` brian m. carlson
2020-01-25 23:00 ` [PATCH v2 04/22] t3308: make test work with SHA-256 brian m. carlson
2020-01-25 23:00 ` [PATCH v2 05/22] t3309: " brian m. carlson
2020-01-25 23:00 ` [PATCH v2 06/22] t3310: " brian m. carlson
2020-01-25 23:00 ` [PATCH v2 07/22] t3311: " brian m. carlson
2020-01-25 23:00 ` [PATCH v2 08/22] t4013: make test hash independent brian m. carlson
2020-01-26 22:08 ` Johannes Schindelin
2020-01-26 22:26 ` brian m. carlson
2020-01-25 23:00 ` [PATCH v2 09/22] t4060: make test work with SHA-256 brian m. carlson
2020-01-25 23:00 ` [PATCH v2 10/22] t4211: make test hash independent brian m. carlson
2020-01-26 22:13 ` Johannes Schindelin
2020-01-25 23:00 ` [PATCH v2 11/22] t5302: make hash size independent brian m. carlson
2020-01-26 22:23 ` Johannes Schindelin [this message]
2020-01-26 22:33 ` brian m. carlson
2020-01-25 23:00 ` [PATCH v2 12/22] t5309: make test hash independent brian m. carlson
2020-01-25 23:00 ` [PATCH v2 13/22] t5313: " brian m. carlson
2020-01-28 18:15 ` Junio C Hamano
2020-01-25 23:00 ` [PATCH v2 14/22] t5321: " brian m. carlson
2020-01-25 23:00 ` [PATCH v2 15/22] t5515: " brian m. carlson
2020-01-28 18:28 ` Junio C Hamano
2020-01-29 4:04 ` brian m. carlson
2020-01-25 23:00 ` [PATCH v2 16/22] t5318: update for SHA-256 brian m. carlson
2020-01-25 23:00 ` [PATCH v2 17/22] t5607: make hash size independent brian m. carlson
2020-01-25 23:00 ` [PATCH v2 17/23] t5616: use correct filter syntax brian m. carlson
2020-01-28 19:06 ` Junio C Hamano
2020-01-29 3:53 ` brian m. carlson
2020-01-25 23:00 ` [PATCH v2 18/23] t5607: make hash size independent brian m. carlson
2020-01-25 23:00 ` [PATCH v2 18/22] t5703: make test work with SHA-256 brian m. carlson
2020-01-28 19:09 ` Junio C Hamano
2020-01-29 3:46 ` brian m. carlson
2020-01-25 23:00 ` [PATCH v2 19/23] " brian m. carlson
2020-01-25 23:00 ` [PATCH v2 19/22] t5703: switch tests to use test_oid brian m. carlson
2020-01-25 23:00 ` [PATCH v2 20/23] " brian m. carlson
2020-01-25 23:00 ` [PATCH v2 20/22] t6000: abstract away SHA-1-specific constants brian m. carlson
2020-01-25 23:00 ` [PATCH v2 21/23] " brian m. carlson
2020-01-25 23:00 ` [PATCH v2 21/22] t6006: make hash size independent brian m. carlson
2020-01-25 23:00 ` [PATCH v2 22/23] " brian m. carlson
2020-01-25 23:00 ` [PATCH v2 22/22] t6024: update for SHA-256 brian m. carlson
2020-01-25 23:00 ` [PATCH v2 23/23] " brian m. carlson
2020-01-26 10:25 ` [PATCH v2 00/23] SHA-256 test fixes, part 8 Johannes Schindelin
2020-01-26 19:42 ` brian m. carlson
2020-01-26 21:30 ` Johannes Schindelin
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2001262315150.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=sandals@crustytoothpaste.net \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).