git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH 00/38] SHA-256, part 3/3

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Jul 10, 2020, 02:46 UTC
Message-ID
<20200710024728.3100527-1-sandals@crustytoothpaste.net>

This is the final part required for the stage 4 implementation of SHA-256.

The beginning part of this series is mostly final test fixes, and should be straightforward. Next are two patches that are required to fix the remaining SHA-256 incompatibilities in our codebase, both of which were necessitated by recent changes.

After that, the meat of the series: support for reading extensions.objectFormat, removal of the compile-time option, and some tests. We introduce a knob to control the testsuite and a wire-in for CI so we don't regress things in the future, and at the end, some docs.

The final patch here is the promised cleanup for test_oid_init in various places in our codebase.

Note that SHA-256 repositories don't currently interoperate with SHA-1 repositories. I'm working on additional patches for the pieces required to implement that and full stage 1, 2, and 3 support, which will be in future series. However, it is possible to have a full SHA-256 repository that is fully functional after this series. I refer the reader to Documentation/technical/hash-function-transition.txt for the details of the different stages.

I do plan to provide a shell-based tool for easier conversion of repositories with submodules at some point in the future, but all the pieces required are already built into fast-import and fast-export.

I would like to thank everyone who's contributed to the SHA-256 work over the years with patches, review, documentation, suggestions, and other contributions. I could not possibly name all of the contributors here, so I won't try. None of this work could have been done without all your help.

I plan to take a brief hiatus from more SHA-256 work after this and work on some other Git- and non-Git-related projects, but I'll probably resume at some point before year's end. I'm happy to provide the in-progress work for next steps if people are interested.

I fully expect this series won't be picked up until after the release, so please feel free to focus on release-related activities for the moment.

Johannes Schindelin (1):
  t3404: prepare 'short SHA-1 collision' tests for SHA-256
brian m. carlson (37):
  t: make test-bloom initialize repository
  t1001: use $ZERO_OID
  t3305: make hash agnostic
  t6100: make hash size independent
  t6101: make hash size independent
  t6301: make hash size independent
  t6500: specify test values for SHA-256
  t6501: avoid hard-coded objects
  t7003: compute appropriate length constant
  t7063: make hash size independent
  t7201: abstract away SHA-1-specific constants
  t7102: abstract away SHA-1-specific constants
  t7400: make hash size independent
  t7405: make hash size independent
  t7506: avoid checking for SHA-1-specific constants
  t7508: use $ZERO_OID instead of hard-coded constant
  t8002: make hash size independent
  t8003: make hash size independent
  t8011: make hash size independent
  t9300: abstract away SHA-1-specific constants
  t9300: use $ZERO_OID instead of hard-coded object ID
  t9301: make hash size independent
  t9350: make hash size independent
  t9500: ensure that algorithm info is preserved in config
  t9700: make hash size independent
  t5308: make test work with SHA-256
  t0410: mark test with SHA1 prerequisite
  http-fetch: set up git directory before parsing pack hashes
  builtin/verify-pack: implement an --object-format option
  setup: add support for reading extensions.objectformat
  Enable SHA-256 support by default
  t: add test_oid option to select hash algorithm
  t: allow testing different hash algorithms via environment
  t: make SHA1 prerequisite depend on default hash
  ci: run tests with SHA-256
  docs: add documentation for extensions.objectFormat
  t: remove test_oid_init in tests
 Documentation/config.txt               |   2 +
 Documentation/config/extensions.txt    |   7 ++
 builtin/init-db.c                      |   5 -
 builtin/verify-pack.c                  |  25 ++--
 ci/run-build-and-tests.sh              |   1 +
 config.mak.dev                         |   2 -
 http-fetch.c                           |   4 +-
 repository.c                           |   4 -
 setup.c                                |  12 +-
 t/helper/test-bloom.c                  |   2 +
 t/lib-pack.sh                          |  11 +-
 t/lib-submodule-update.sh              |   1 -
 t/t0000-basic.sh                       |  15 ++-
 t/t0001-init.sh                        |  31 +++++
 t/t0410-partial-clone.sh               |   2 +-
 t/t1006-cat-file.sh                    |   2 -
 t/t1050-large.sh                       |   1 -
 t/t1091-sparse-checkout-builtin.sh     |   4 +-
 t/t1410-reflog.sh                      |   1 -
 t/t1450-fsck.sh                        |   1 -
 t/t1500-rev-parse.sh                   |   1 -
 t/t3305-notes-fanout.sh                |   2 +-
 t/t3308-notes-merge.sh                 |   1 -
 t/t3404-rebase-interactive.sh          |  49 ++++++--
 t/t3600-rm.sh                          |   1 -
 t/t3800-mktag.sh                       |   1 -
 t/t4002-diff-basic.sh                  |   2 -
 t/t4027-diff-submodule.sh              |   1 -
 t/t4134-apply-submodule.sh             |   1 -
 t/t4200-rerere.sh                      |   1 -
 t/t4211-line-log.sh                    |   1 -
 t/t5300-pack-object.sh                 |   3 +-
 t/t5302-pack-index.sh                  |   1 -
 t/t5308-pack-detect-duplicates.sh      |  20 ++--
 t/t5313-pack-bounds-checks.sh          |   1 -
 t/t5318-commit-graph.sh                |   3 +-
 t/t5319-multi-pack-index.sh            |   1 -
 t/t5324-split-commit-graph.sh          |   1 -
 t/t5504-fetch-receive-strict.sh        |   1 -
 t/t5530-upload-pack-error.sh           |   1 -
 t/t5562-http-backend-content-length.sh |   1 -
 t/t5702-protocol-v2.sh                 |   3 +-
 t/t5703-upload-pack-ref-in-want.sh     |   1 -
 t/t6006-rev-list-format.sh             |   1 -
 t/t6100-rev-list-in-order.sh           |   4 +-
 t/t6101-rev-parse-parents.sh           |   2 +-
 t/t6301-for-each-ref-errors.sh         |   2 +-
 t/t6500-gc.sh                          |  27 ++++-
 t/t6501-freshen-objects.sh             |  14 +--
 t/t7003-filter-branch.sh               |   3 +-
 t/t7063-status-untracked-cache.sh      | 155 +++++++++++++------------
 t/t7102-reset.sh                       |  93 ++++++++-------
 t/t7201-co.sh                          |   5 +-
 t/t7400-submodule-basic.sh             |  26 ++---
 t/t7405-submodule-merge.sh             |   4 +-
 t/t7506-status-submodule.sh            |  12 +-
 t/t7508-status.sh                      |   2 +-
 t/t8002-blame.sh                       |  15 +--
 t/t8003-blame-corner-cases.sh          |   3 +-
 t/t8011-blame-split-file.sh            |   2 +-
 t/t9300-fast-import.sh                 | 117 ++++++++++---------
 t/t9301-fast-import-notes.sh           |  13 +--
 t/t9350-fast-export.sh                 |  15 ++-
 t/t9500-gitweb-standalone-no-errors.sh |  22 +++-
 t/t9700/test.pl                        |   6 +-
 t/test-lib-functions.sh                |  16 ++-
 t/test-lib.sh                          |   6 +-
 67 files changed, 472 insertions(+), 324 deletions(-)
 create mode 100644 Documentation/config/extensions.txt
Next: brian m. carlson
Message 1 of 50 in “SHA-256, part 3/3”
  1. 00/38 SHA-256, part 3/3brian m. carlson, Jul 10, 2020
  2. 01/38 t: make test-bloom initialize repositorybrian m. carlson, Jul 10, 2020
  3. 03/38 t3305: make hash agnosticbrian m. carlson, Jul 10, 2020
  4. 02/38 t1001: use $ZERO_OIDbrian m. carlson, Jul 10, 2020
  5. 04/38 t3404: prepare 'short SHA-1 collision' tests for SHA-256brian m. carlson, Jul 10, 2020
  6. 11/38 t7063: make hash size independentbrian m. carlson, Jul 10, 2020
  7. Junio C HamanoJul 11, 2020
  8. brian m. carlsonJul 11, 2020
  9. 05/38 t6100: make hash size independentbrian m. carlson, Jul 10, 2020
  10. 07/38 t6301: make hash size independentbrian m. carlson, Jul 10, 2020
  11. 10/38 t7003: compute appropriate length constantbrian m. carlson, Jul 10, 2020
  12. 12/38 t7201: abstract away SHA-1-specific constantsbrian m. carlson, Jul 10, 2020
  13. 13/38 t7102: abstract away SHA-1-specific constantsbrian m. carlson, Jul 10, 2020
  14. 18/38 t8002: make hash size independentbrian m. carlson, Jul 10, 2020
  15. 16/38 t7506: avoid checking for SHA-1-specific constantsbrian m. carlson, Jul 10, 2020
  16. 23/38 t9301: make hash size independentbrian m. carlson, Jul 10, 2020
  17. 27/38 t5308: make test work with SHA-256brian m. carlson, Jul 10, 2020
  18. 28/38 t0410: mark test with SHA1 prerequisitebrian m. carlson, Jul 10, 2020
  19. 37/38 docs: add documentation for extensions.objectFormatbrian m. carlson, Jul 10, 2020
  20. Martin ÅgrenJul 10, 2020
  21. 33/38 t: add test_oid option to select hash algorithmbrian m. carlson, Jul 10, 2020
  22. 32/38 Enable SHA-256 support by defaultbrian m. carlson, Jul 10, 2020
  23. 36/38 ci: run tests with SHA-256brian m. carlson, Jul 10, 2020
  24. Derrick StoleeJul 10, 2020
  25. 09/38 t6501: avoid hard-coded objectsbrian m. carlson, Jul 10, 2020
  26. 08/38 t6500: specify test values for SHA-256brian m. carlson, Jul 10, 2020
  27. 06/38 t6101: make hash size independentbrian m. carlson, Jul 10, 2020
  28. 35/38 t: make SHA1 prerequisite depend on default hashbrian m. carlson, Jul 10, 2020
  29. Denton LiuJul 12, 2020
  30. Junio C HamanoJul 12, 2020
  31. 38/38 t: remove test_oid_init in testsbrian m. carlson, Jul 10, 2020
  32. 31/38 setup: add support for reading extensions.objectformatbrian m. carlson, Jul 10, 2020
  33. 25/38 t9500: ensure that algorithm info is preserved in configbrian m. carlson, Jul 10, 2020
  34. 22/38 t9300: use $ZERO_OID instead of hard-coded object IDbrian m. carlson, Jul 10, 2020
  35. 26/38 t9700: make hash size independentbrian m. carlson, Jul 10, 2020
  36. 24/38 t9350: make hash size independentbrian m. carlson, Jul 10, 2020
  37. 20/38 t8011: make hash size independentbrian m. carlson, Jul 10, 2020
  38. 30/38 builtin/verify-pack: implement an --object-format optionbrian m. carlson, Jul 10, 2020
  39. 34/38 t: allow testing different hash algorithms via environmentbrian m. carlson, Jul 10, 2020
  40. 29/38 http-fetch: set up git directory before parsing pack hashesbrian m. carlson, Jul 10, 2020
  41. 21/38 t9300: abstract away SHA-1-specific constantsbrian m. carlson, Jul 10, 2020
  42. 19/38 t8003: make hash size independentbrian m. carlson, Jul 10, 2020
  43. 14/38 t7400: make hash size independentbrian m. carlson, Jul 10, 2020
  44. 17/38 t7508: use $ZERO_OID instead of hard-coded constantbrian m. carlson, Jul 10, 2020
  45. 15/38 t7405: make hash size independentbrian m. carlson, Jul 10, 2020
  46. Derrick StoleeJul 10, 2020
  47. brian m. carlsonJul 10, 2020
  48. Junio C HamanoJul 10, 2020
  49. Junio C HamanoJul 11, 2020
  50. brian m. carlsonJul 11, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.