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

[PATCH v3 23/39] t9301: make hash size independent

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Jul 23, 2020, 01:09 UTC
Message-ID
<20200723010943.2329634-24-sandals@crustytoothpaste.net>
In-Reply-To
<20200723010943.2329634-1-sandals@crustytoothpaste.net>

Instead of using a hard-coded all-zeros object ID, use $ZERO_OID. Compute the length of the object IDs in use and use this instead of hard-coding the constant 40.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t9301-fast-import-notes.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh
index ca223dca98..9d1aaac980 100755
--- a/t/t9301-fast-import-notes.sh
+++ b/t/t9301-fast-import-notes.sh
@@ -71,7 +71,7 @@ EOF
 INPUT_END
 
 test_expect_success 'set up master branch' '
-
+	test_oid_init &&
 	git fast-import <input &&
 	git whatchanged master
 '
@@ -470,12 +470,13 @@ test_expect_success 'add lots of commits and notes' '
 '
 
 test_expect_success 'verify that lots of notes trigger a fanout scheme' '
+	hexsz=$(test_oid hexsz) &&
 
 	# None of the entries in the top-level notes tree should be a full SHA1
 	git ls-tree --name-only refs/notes/many_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -518,7 +519,7 @@ test_expect_success 'verify that importing a notes tree respects the fanout sche
 	git ls-tree --name-only refs/notes/other_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -593,7 +594,7 @@ test_expect_success 'verify that changing notes respect existing fanout' '
 	git ls-tree --name-only refs/notes/many_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -616,7 +617,7 @@ i=$(($num_commits - $remaining_notes))
 for sha1 in $(git rev-list -n $i refs/heads/many_commits)
 do
 	cat >>input <<INPUT_END
-N 0000000000000000000000000000000000000000 $sha1
+N $ZERO_OID $sha1
 INPUT_END
 done
 
@@ -646,7 +647,6 @@ test_expect_success 'remove lots of notes' '
 '
 
 test_expect_success 'verify that removing notes trigger fanout consolidation' '
-
 	# All entries in the top-level notes tree should be a full SHA1
 	git ls-tree --name-only -r refs/notes/many_notes |
 	while read path
@@ -656,7 +656,7 @@ test_expect_success 'verify that removing notes trigger fanout consolidation' '
 		test "$path" = "deadbeef" && continue
 		test "$path" = "de/adbeef" && continue
 
-		if test $(expr length "$path") -ne 40
+		if test $(expr length "$path") -ne $hexsz
 		then
 			return 1
 		fi
Previous: brian m. carlsonNext: brian m. carlson
Message 9 of 52 in “SHA-256, part 3/3”
  1. 00/39 SHA-256, part 3/3brian m. carlson, Jul 23, 2020
  2. 02/39 t1001: use $ZERO_OIDbrian m. carlson, Jul 23, 2020
  3. 03/39 t3305: make hash agnosticbrian m. carlson, Jul 23, 2020
  4. 14/39 t7400: make hash size independentbrian m. carlson, Jul 23, 2020
  5. 05/39 t6100: make hash size independentbrian m. carlson, Jul 23, 2020
  6. 19/39 t8003: make hash size independentbrian m. carlson, Jul 23, 2020
  7. 18/39 t8002: make hash size independentbrian m. carlson, Jul 23, 2020
  8. 22/39 t9300: use $ZERO_OID instead of hard-coded object IDbrian m. carlson, Jul 23, 2020
  9. 23/39 t9301: make hash size independentbrian m. carlson, Jul 23, 2020
  10. 26/39 t9700: make hash size independentbrian m. carlson, Jul 23, 2020
  11. 25/39 t9500: ensure that algorithm info is preserved in configbrian m. carlson, Jul 23, 2020
  12. 24/39 t9350: make hash size independentbrian m. carlson, Jul 23, 2020
  13. 30/39 builtin/verify-pack: implement an --object-format optionbrian m. carlson, Jul 23, 2020
  14. Eric SunshineJul 23, 2020
  15. 31/39 bundle: add new version for use with SHA-256brian m. carlson, Jul 23, 2020
  16. Eric SunshineJul 23, 2020
  17. Eric SunshineJul 23, 2020
  18. brian m. carlsonJul 24, 2020
  19. 38/39 docs: add documentation for extensions.objectFormatbrian m. carlson, Jul 23, 2020
  20. 37/39 ci: run tests with SHA-256brian m. carlson, Jul 23, 2020
  21. 32/39 setup: add support for reading extensions.objectformatbrian m. carlson, Jul 23, 2020
  22. Junio C HamanoJul 23, 2020
  23. brian m. carlsonJul 23, 2020
  24. Junio C HamanoJul 23, 2020
  25. brian m. carlsonJul 25, 2020
  26. 33/39 Enable SHA-256 support by defaultbrian m. carlson, Jul 23, 2020
  27. 39/39 t: remove test_oid_init in testsbrian m. carlson, Jul 23, 2020
  28. 20/39 t8011: make hash size independentbrian m. carlson, Jul 23, 2020
  29. 29/39 http-fetch: set up git directory before parsing pack hashesbrian m. carlson, Jul 23, 2020
  30. 08/39 t6500: specify test values for SHA-256brian m. carlson, Jul 23, 2020
  31. 13/39 t7102: abstract away SHA-1-specific constantsbrian m. carlson, Jul 23, 2020
  32. 11/39 t7063: make hash size independentbrian m. carlson, Jul 23, 2020
  33. 04/39 t3404: prepare 'short SHA-1 collision' tests for SHA-256brian m. carlson, Jul 23, 2020
  34. 06/39 t6101: make hash size independentbrian m. carlson, Jul 23, 2020
  35. 09/39 t6501: avoid hard-coded objectsbrian m. carlson, Jul 23, 2020
  36. 01/39 t: make test-bloom initialize repositorybrian m. carlson, Jul 23, 2020
  37. 12/39 t7201: abstract away SHA-1-specific constantsbrian m. carlson, Jul 23, 2020
  38. 17/39 t7508: use $ZERO_OID instead of hard-coded constantbrian m. carlson, Jul 23, 2020
  39. 10/39 t7003: compute appropriate length constantbrian m. carlson, Jul 23, 2020
  40. 07/39 t6301: make hash size independentbrian m. carlson, Jul 23, 2020
  41. 21/39 t9300: abstract away SHA-1-specific constantsbrian m. carlson, Jul 23, 2020
  42. 16/39 t7506: avoid checking for SHA-1-specific constantsbrian m. carlson, Jul 23, 2020
  43. 15/39 t7405: make hash size independentbrian m. carlson, Jul 23, 2020
  44. 34/39 t: add test_oid option to select hash algorithmbrian m. carlson, Jul 23, 2020
  45. Eric SunshineJul 23, 2020
  46. brian m. carlsonJul 23, 2020
  47. Eric SunshineJul 23, 2020
  48. Junio C HamanoJul 24, 2020
  49. 35/39 t: allow testing different hash algorithms via environmentbrian m. carlson, Jul 23, 2020
  50. 36/39 t: make SHA1 prerequisite depend on default hashbrian m. carlson, Jul 23, 2020
  51. 27/39 t5308: make test work with SHA-256brian m. carlson, Jul 23, 2020
  52. 28/39 t0410: mark test with SHA1 prerequisitebrian m. carlson, Jul 23, 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.