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

[PATCH v2 11/28] t2203: abstract away SHA-1-specific constants

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
May 13, 2018, 02:24 UTC
Message-ID
<20180513022438.60003-12-sandals@crustytoothpaste.net>
In-Reply-To
<20180513022438.60003-1-sandals@crustytoothpaste.net>

Adjust the test so that it computes variables for blobs instead of using hard-coded hashes.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
---
 t/t2203-add-intent.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 1797f946b9..04d840a544 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -27,8 +27,8 @@ test_expect_success 'git status' '
 
 test_expect_success 'git status with porcelain v2' '
 	git status --porcelain=v2 | grep -v "^?" >actual &&
-	nam1=d00491fd7e5bb6fa28c517a0bb32b8b506539d4d &&
-	nam2=ce013625030ba8dba906f756967f9e9ca394464a &&
+	nam1=$(echo 1 | git hash-object --stdin) &&
+	nam2=$(git hash-object elif) &&
 	cat >expect <<-EOF &&
 	1 DA N... 100644 000000 100644 $nam1 $ZERO_OID 1.t
 	1 A. N... 000000 100644 100644 $ZERO_OID $nam2 elif
@@ -181,7 +181,7 @@ test_expect_success 'rename detection finds the right names' '
 		EOF
 		test_cmp expected.2 actual.2 &&
 
-		hash=12f00e90b6ef79117ce6e650416b8cf517099b78 &&
+		hash=$(git hash-object third) &&
 		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
 		cat >expected.3 <<-EOF &&
 		2 .R N... 100644 100644 100644 $hash $hash R100 third	first
@@ -212,7 +212,7 @@ test_expect_success 'double rename detection in status' '
 		EOF
 		test_cmp expected.2 actual.2 &&
 
-		hash=12f00e90b6ef79117ce6e650416b8cf517099b78 &&
+		hash=$(git hash-object third) &&
 		git status --porcelain=v2 | grep -v "^?" >actual.3 &&
 		cat >expected.3 <<-EOF &&
 		2 R. N... 100644 100644 100644 $hash $hash R100 second	first
Previous: brian m. carlsonNext: brian m. carlson
Message 10 of 31 in “Hash-independent tests (part 2)”
  1. 00/28 Hash-independent tests (part 2)brian m. carlson, May 13, 2018
  2. 01/28 t/test-lib: add an SHA1 prerequisitebrian m. carlson, May 13, 2018
  3. 02/28 t/test-lib: introduce ZERO_OIDbrian m. carlson, May 13, 2018
  4. 03/28 t: switch $_z40 to $ZERO_OIDbrian m. carlson, May 13, 2018
  5. 04/28 t/test-lib: introduce OID_REGEXbrian m. carlson, May 13, 2018
  6. 05/28 t: switch $_x40 to $OID_REGEXbrian m. carlson, May 13, 2018
  7. 06/28 t0000: annotate with SHA1 prerequisitebrian m. carlson, May 13, 2018
  8. 07/28 t1007: annotate with SHA1 prerequisitebrian m. carlson, May 13, 2018
  9. 09/28 t4044: skip test if not using SHA-1brian m. carlson, May 13, 2018
  10. 11/28 t2203: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  11. 10/28 t: skip pack tests if not using SHA-1brian m. carlson, May 13, 2018
  12. 08/28 t1512: skip test if not using SHA-1brian m. carlson, May 13, 2018
  13. 12/28 t3103: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  14. 15/28 t4007: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  15. 17/28 t4014: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  16. Johannes SixtMay 13, 2018
  17. brian m. carlsonMay 13, 2018
  18. 18/28 t4020: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  19. 21/28 t4029: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  20. 19/28 t4022: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  21. 24/28 t4205: sort log output in a hash-independent waybrian m. carlson, May 13, 2018
  22. 26/28 t4045: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  23. 25/28 t4042: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  24. 28/28 t5300: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  25. 27/28 t4208: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  26. 20/28 t4029: fix test indentationbrian m. carlson, May 13, 2018
  27. 23/28 t/lib-diff-alternative: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  28. 22/28 t4030: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  29. 13/28 t3702: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  30. 16/28 t4008: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018
  31. 14/28 t3905: abstract away SHA-1-specific constantsbrian m. carlson, May 13, 2018

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.