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

[PATCH v4 22/39] t9300: use $ZERO_OID instead of hard-coded object ID

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Jul 26, 2020, 19:54 UTC
Message-ID
<20200726195424.626969-23-sandals@crustytoothpaste.net>
In-Reply-To
<20200726195424.626969-1-sandals@crustytoothpaste.net>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t9300-fast-import.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 69d6fa4127..f4b3f5eaf9 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -92,7 +92,7 @@ test_expect_success 'A: create pack from stdin' '
 	EOF
 
 	reset refs/tags/to-be-deleted
-	from 0000000000000000000000000000000000000000
+	from $ZERO_OID
 
 	tag nested
 	mark :6
@@ -102,7 +102,7 @@ test_expect_success 'A: create pack from stdin' '
 	EOF
 
 	reset refs/tags/nested
-	from 0000000000000000000000000000000000000000
+	from $ZERO_OID
 
 	tag nested
 	mark :7
@@ -285,7 +285,7 @@ test_expect_success 'A: verify pack' '
 
 test_expect_success 'A: verify diff' '
 	cat >expect <<-EOF &&
-	:000000 100755 0000000000000000000000000000000000000000 $(git rev-parse --verify master:file2) A	copy-of-file2
+	:000000 100755 $ZERO_OID $(git rev-parse --verify master:file2) A	copy-of-file2
 	EOF
 	git diff-tree -M -r master verify--import-marks >actual &&
 	compare_diff_raw expect actual &&
@@ -364,7 +364,7 @@ test_expect_success 'B: fail on invalid blob sha1' '
 	COMMIT
 
 	from refs/heads/master
-	M 755 0000000000000000000000000000000000000001 zero1
+	M 755 $(echo $ZERO_OID | sed -e "s/0$/1/") zero1
 
 	INPUT_END
 
@@ -619,8 +619,8 @@ test_expect_success 'D: validate new files added' '
 	f5id=$(echo "$file5_data" | git hash-object --stdin) &&
 	f6id=$(echo "$file6_data" | git hash-object --stdin) &&
 	cat >expect <<-EOF &&
-	:000000 100755 0000000000000000000000000000000000000000 $f6id A	newdir/exec.sh
-	:000000 100644 0000000000000000000000000000000000000000 $f5id A	newdir/interesting
+	:000000 100755 $ZERO_OID $f6id A	newdir/exec.sh
+	:000000 100644 $ZERO_OID $f5id A	newdir/interesting
 	EOF
 	git diff-tree -M -r branch^ branch >actual &&
 	compare_diff_raw expect actual
@@ -2732,7 +2732,7 @@ test_expect_success 'R: corrupt lines do not mess marks file' '
 	rm -f io.marks &&
 	blob=$(echo hi | git hash-object --stdin) &&
 	cat >expect <<-EOF &&
-	:3 0000000000000000000000000000000000000000
+	:3 $ZERO_OID
 	:1 $blob
 	:2 $blob
 	EOF
@@ -3083,7 +3083,7 @@ test_expect_success 'T: delete branch' '
 	git branch to-delete &&
 	git fast-import <<-EOF &&
 	reset refs/heads/to-delete
-	from 0000000000000000000000000000000000000000
+	from $ZERO_OID
 	EOF
 	test_must_fail git rev-parse --verify refs/heads/to-delete
 '
Previous: brian m. carlsonNext: brian m. carlson
Message 47 of 58 in “SHA-256, part 3/3”
  1. 00/39 SHA-256, part 3/3brian m. carlson, Jul 26, 2020
  2. 01/39 t: make test-bloom initialize repositorybrian m. carlson, Jul 26, 2020
  3. 02/39 t1001: use $ZERO_OIDbrian m. carlson, Jul 26, 2020
  4. 07/39 t6301: make hash size independentbrian m. carlson, Jul 26, 2020
  5. 05/39 t6100: make hash size independentbrian m. carlson, Jul 26, 2020
  6. 04/39 t3404: prepare 'short SHA-1 collision' tests for SHA-256brian m. carlson, Jul 26, 2020
  7. Eric SunshineJul 26, 2020
  8. 15/39 t7405: make hash size independentbrian m. carlson, Jul 26, 2020
  9. 12/39 t7201: abstract away SHA-1-specific constantsbrian m. carlson, Jul 26, 2020
  10. Eric SunshineJul 26, 2020
  11. 19/39 t8003: make hash size independentbrian m. carlson, Jul 26, 2020
  12. 13/39 t7102: abstract away SHA-1-specific constantsbrian m. carlson, Jul 26, 2020
  13. 18/39 t8002: make hash size independentbrian m. carlson, Jul 26, 2020
  14. Eric SunshineJul 26, 2020
  15. 20/39 t8011: make hash size independentbrian m. carlson, Jul 26, 2020
  16. Eric SunshineJul 26, 2020
  17. 23/39 t9301: make hash size independentbrian m. carlson, Jul 26, 2020
  18. 29/39 http-fetch: set up git directory before parsing pack hashesbrian m. carlson, Jul 26, 2020
  19. Eric SunshineJul 26, 2020
  20. Eric SunshineJul 26, 2020
  21. 35/39 t: allow testing different hash algorithms via environmentbrian m. carlson, Jul 26, 2020
  22. 38/39 docs: add documentation for extensions.objectFormatbrian m. carlson, Jul 26, 2020
  23. Eric SunshineJul 26, 2020
  24. 37/39 ci: run tests with SHA-256brian m. carlson, Jul 26, 2020
  25. Eric SunshineJul 26, 2020
  26. 33/39 Enable SHA-256 support by defaultbrian m. carlson, Jul 26, 2020
  27. Eric SunshineJul 26, 2020
  28. 32/39 setup: add support for reading extensions.objectformatbrian m. carlson, Jul 26, 2020
  29. Eric SunshineJul 26, 2020
  30. brian m. carlsonJul 26, 2020
  31. 28/39 t0410: mark test with SHA1 prerequisitebrian m. carlson, Jul 26, 2020
  32. 34/39 t: add test_oid option to select hash algorithmbrian m. carlson, Jul 26, 2020
  33. 36/39 t: make SHA1 prerequisite depend on default hashbrian m. carlson, Jul 26, 2020
  34. Eric SunshineJul 26, 2020
  35. 26/39 t9700: make hash size independentbrian m. carlson, Jul 26, 2020
  36. 24/39 t9350: make hash size independentbrian m. carlson, Jul 26, 2020
  37. 25/39 t9500: ensure that algorithm info is preserved in configbrian m. carlson, Jul 26, 2020
  38. 17/39 t7508: use $ZERO_OID instead of hard-coded constantbrian m. carlson, Jul 26, 2020
  39. 06/39 t6101: make hash size independentbrian m. carlson, Jul 26, 2020
  40. 08/39 t6500: specify test values for SHA-256brian m. carlson, Jul 26, 2020
  41. 03/39 t3305: make hash agnosticbrian m. carlson, Jul 26, 2020
  42. 16/39 t7506: avoid checking for SHA-1-specific constantsbrian m. carlson, Jul 26, 2020
  43. 09/39 t6501: avoid hard-coded objectsbrian m. carlson, Jul 26, 2020
  44. 11/39 t7063: make hash size independentbrian m. carlson, Jul 26, 2020
  45. Eric SunshineJul 26, 2020
  46. 10/39 t7003: compute appropriate length constantbrian m. carlson, Jul 26, 2020
  47. 22/39 t9300: use $ZERO_OID instead of hard-coded object IDbrian m. carlson, Jul 26, 2020
  48. 14/39 t7400: make hash size independentbrian m. carlson, Jul 26, 2020
  49. 21/39 t9300: abstract away SHA-1-specific constantsbrian m. carlson, Jul 26, 2020
  50. Eric SunshineJul 26, 2020
  51. 27/39 t5308: make test work with SHA-256brian m. carlson, Jul 26, 2020
  52. 30/39 builtin/verify-pack: implement an --object-format optionbrian m. carlson, Jul 26, 2020
  53. Eric SunshineJul 26, 2020
  54. brian m. carlsonJul 26, 2020
  55. 31/39 bundle: add new version for use with SHA-256brian m. carlson, Jul 26, 2020
  56. Eric SunshineJul 26, 2020
  57. brian m. carlsonJul 26, 2020
  58. 39/39 t: remove test_oid_init in testsbrian m. carlson, Jul 26, 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.