From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: <git@vger.kernel.org>
Cc: Jonathan Tan <jonathantanmy@google.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: [PATCH 00/24] SHA-256 test fixes, part 8
Date: Mon, 13 Jan 2020 12:38:33 +0000 [thread overview]
Message-ID: <20200113123857.3684632-1-sandals@crustytoothpaste.net> (raw)
This is the second-to-last series of test fixes for SHA-256. Most of
them are rather boring, but there are a few notable exceptions.
t3305 appears to fail with SHA-256 due to the fanout not compressing as
expected. I believe this is a legitimate bug that our transition to
SHA-256 exposes, but it's unclear to me why it happens and I'm not
familiar enough with the code to figure out what's going on[0]. I've
CC'd Dscho, since he seems to be the person most familiar with the notes
code who's still involved in the project.
I suspect that t3404 also has a bug, since the object IDs that are
supposed to collide do not, according to my instrumentation of the test.
I'm unsure what the intended collision was and consequently haven't
fixed it. However, it does work with SHA-256 as it stands and is no
more or less functional than with SHA-1, so I've removed the
prerequisite.
I believe the fix in t5616 is correct and still supports the intent of
the test, but I'd appreciate any feedback there. Why it works with
SHA-1 is unclear to me, but my conjecture is that it's due to ordering
of the object IDs. I've CC'd Jonathan Tan about this issue since he
seems to be most familiar with that test.
t/lib-pack.sh is updated in this commit, but I expect a small number of
additional fixes to come in with part 9 to support t5308.
I fully expect that this series won't be picked up until after the
release, and that's fine. It is based on master and intentionally does
not require the other in-flight test series. I expect a reroll due to
the aforementioned suspected bugs.
Of course, feedback on any aspect of this series is welcome.
[0] While working on the transition to SHA-256, I've found myself quite
confused by the notes code in general, mostly due to the way it uses
partial object IDs. Reading about the feature (which I'd previously
never used) was indeed helpful, though, so thanks to the folks who wrote
the documentation.
brian m. carlson (24):
t/lib-pack: support SHA-256
t3206: make hash size independent
t3305: annotate with SHA1 prerequisite
t3308: make test work with SHA-256
t3309: make test work with SHA-256
t3310: make test work with SHA-256
t3311: make test work with SHA-256
t3404: remove SHA1 prerequisite
t4013: make test hash independent
t4060: make test work with SHA-256
t4211: make test hash independent
t5302: make hash size independent
t5309: make test hash independent
t5313: make test hash independent
t5321: make test hash independent
t5515: make test hash independent
t5318: update for SHA-256
t5616: use correct filter syntax
t5607: make hash size independent
t5703: make test work with SHA-256
t5703: switch tests to use test_oid
t6000: abstract away SHA-1-specific constants
t6006: make hash size independent
t6024: update for SHA-256
t/lib-pack.sh | 35 ++-
t/t3206-range-diff.sh | 14 +-
t/t3305-notes-fanout.sh | 2 +-
t/t3308-notes-merge.sh | 83 ++++---
t/t3309-notes-merge-auto-resolve.sh | 228 ++++++++++++-------
t/t3310-notes-merge-manual-resolve.sh | 84 ++++---
t/t3311-notes-merge-fanout.sh | 60 +++--
t/t3404-rebase-interactive.sh | 4 +-
t/t4013-diff-various.sh | 44 +++-
t/t4060-diff-submodule-option-diff-format.sh | 126 +++++-----
t/t4211-line-log.sh | 14 +-
t/t5302-pack-index.sh | 18 +-
t/t5309-pack-delta-cycles.sh | 10 +-
t/t5313-pack-bounds-checks.sh | 19 +-
t/t5318-commit-graph.sh | 4 +-
t/t5321-pack-large-objects.sh | 4 +-
t/t5515-fetch-merge-logic.sh | 51 ++++-
t/t5607-clone-bundle.sh | 2 +-
t/t5616-partial-clone.sh | 2 +-
t/t5703-upload-pack-ref-in-want.sh | 7 +-
t/t6000-rev-list-misc.sh | 13 +-
t/t6006-rev-list-format.sh | 4 +-
t/t6024-recursive-merge.sh | 15 +-
23 files changed, 562 insertions(+), 281 deletions(-)
next reply other threads:[~2020-01-13 12:40 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-13 12:38 brian m. carlson [this message]
2020-01-13 12:38 ` [PATCH 01/24] t/lib-pack: support SHA-256 brian m. carlson
2020-01-13 12:38 ` [PATCH 02/24] t3206: make hash size independent brian m. carlson
2020-01-13 12:38 ` [PATCH 03/24] t3305: annotate with SHA1 prerequisite brian m. carlson
2020-01-13 12:38 ` [PATCH 04/24] t3308: make test work with SHA-256 brian m. carlson
2020-01-13 12:38 ` [PATCH 05/24] t3309: " brian m. carlson
2020-01-13 12:38 ` [PATCH 06/24] t3310: " brian m. carlson
2020-01-13 12:38 ` [PATCH 07/24] t3311: " brian m. carlson
2020-01-13 12:38 ` [PATCH 08/24] t3404: remove SHA1 prerequisite brian m. carlson
2020-01-13 12:38 ` [PATCH 09/24] t4013: make test hash independent brian m. carlson
2020-01-13 12:38 ` [PATCH 10/24] t4060: make test work with SHA-256 brian m. carlson
2020-01-13 12:38 ` [PATCH 11/24] t4211: make test hash independent brian m. carlson
2020-01-13 12:38 ` [PATCH 12/24] t5302: make hash size independent brian m. carlson
2020-01-13 12:38 ` [PATCH 13/24] t5309: make test hash independent brian m. carlson
2020-01-13 12:38 ` [PATCH 14/24] t5313: " brian m. carlson
2020-01-13 12:38 ` [PATCH 15/24] t5321: " brian m. carlson
2020-01-13 12:38 ` [PATCH 16/24] t5515: " brian m. carlson
2020-01-13 12:38 ` [PATCH 17/24] t5318: update for SHA-256 brian m. carlson
2020-01-13 13:50 ` Eric Sunshine
2020-01-13 23:14 ` brian m. carlson
2020-01-13 12:38 ` [PATCH 18/24] t5616: use correct filter syntax brian m. carlson
2020-01-13 20:28 ` [PATCH] t5616: make robust to delta base change Jonathan Tan
2020-01-13 23:11 ` brian m. carlson
2020-01-25 22:43 ` brian m. carlson
2020-01-13 12:38 ` [PATCH 19/24] t5607: make hash size independent brian m. carlson
2020-01-13 12:38 ` [PATCH 20/24] t5703: make test work with SHA-256 brian m. carlson
2020-01-13 13:53 ` Eric Sunshine
2020-01-13 23:15 ` brian m. carlson
2020-01-13 12:38 ` [PATCH 21/24] t5703: switch tests to use test_oid brian m. carlson
2020-01-13 12:38 ` [PATCH 22/24] t6000: abstract away SHA-1-specific constants brian m. carlson
2020-01-13 12:38 ` [PATCH 23/24] t6006: make hash size independent brian m. carlson
2020-01-13 12:38 ` [PATCH 24/24] t6024: update for SHA-256 brian m. carlson
2020-01-13 13:41 ` [PATCH 00/24] SHA-256 test fixes, part 8 Eric Sunshine
2020-01-13 23:17 ` brian m. carlson
2020-01-13 23:34 ` Eric Sunshine
2020-01-16 0:28 ` 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=20200113123857.3684632-1-sandals@crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jonathantanmy@google.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).