t1007: annotate with SHA1 prerequisite

bk2204 · gitster · commit 0fbdb52f9eb1 · 2018-05-14T11:02:01.000+09:00
Since this is a core test that tests basic functionality, annotate the
assertions that have dependencies on SHA-1 with the appropriate
prerequisite.

Signed-off-by: brian m. carlson &lt;sandals@crustytoothpaste.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
@@ -9,13 +9,13 @@ echo_without_newline() {
 }
 
 test_blob_does_not_exist() {
-	test_expect_success 'blob does not exist in database' "
+	test_expect_success SHA1 'blob does not exist in database' "
 		test_must_fail git cat-file blob $1
 	"
 }
 
 test_blob_exists() {
-	test_expect_success 'blob exists in database' "
+	test_expect_success SHA1 'blob exists in database' "
 		git cat-file blob $1
 	"
 }
@@ -73,19 +73,19 @@ test_expect_success "Can't use --path with --no-filters" '
 
 push_repo
 
-test_expect_success 'hash a file' '
+test_expect_success SHA1 'hash a file' '
 	test $hello_sha1 = $(git hash-object hello)
 '
 
 test_blob_does_not_exist $hello_sha1
 
-test_expect_success 'hash from stdin' '
+test_expect_success SHA1 'hash from stdin' '
 	test $example_sha1 = $(git hash-object --stdin < example)
 '
 
 test_blob_does_not_exist $example_sha1
 
-test_expect_success 'hash a file and write to database' '
+test_expect_success SHA1 'hash a file and write to database' '
 	test $hello_sha1 = $(git hash-object -w hello)
 '
 
@@ -161,7 +161,7 @@ pop_repo
 for args in "-w --stdin" "--stdin -w"; do
 	push_repo
 
-	test_expect_success "hash from stdin and write to database ($args)" '
+	test_expect_success SHA1 "hash from stdin and write to database ($args)" '
 		test $example_sha1 = $(git hash-object $args < example)
 	'
 
@@ -176,14 +176,14 @@ example"
 sha1s="$hello_sha1
 $example_sha1"
 
-test_expect_success "hash two files with names on stdin" '
+test_expect_success SHA1 "hash two files with names on stdin" '
 	test "$sha1s" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
 '
 
 for args in "-w --stdin-paths" "--stdin-paths -w"; do
 	push_repo
 
-	test_expect_success "hash two files with names on stdin and write to database ($args)" '
+	test_expect_success SHA1 "hash two files with names on stdin and write to database ($args)" '
 		test "$sha1s" = "$(echo_without_newline "$filenames" | git hash-object $args)"
 	'
 

Original file line number	Diff line number	Diff line change
`@@ -9,13 +9,13 @@ echo_without_newline() {`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`test_blob_does_not_exist() {`
`12`		`- test_expect_success 'blob does not exist in database' "`
	`12`	`+ test_expect_success SHA1 'blob does not exist in database' "`
`13`	`13`	`test_must_fail git cat-file blob $1`
`14`	`14`	`"`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`test_blob_exists() {`
`18`		`- test_expect_success 'blob exists in database' "`
	`18`	`+ test_expect_success SHA1 'blob exists in database' "`
`19`	`19`	`git cat-file blob $1`
`20`	`20`	`"`
`21`	`21`	`}`
`@@ -73,19 +73,19 @@ test_expect_success "Can't use --path with --no-filters" '`
`73`	`73`
`74`	`74`	`push_repo`
`75`	`75`
`76`		`-test_expect_success 'hash a file' '`
	`76`	`+test_expect_success SHA1 'hash a file' '`
`77`	`77`	`test $hello_sha1 = $(git hash-object hello)`
`78`	`78`	`'`
`79`	`79`
`80`	`80`	`test_blob_does_not_exist $hello_sha1`
`81`	`81`
`82`		`-test_expect_success 'hash from stdin' '`
	`82`	`+test_expect_success SHA1 'hash from stdin' '`
`83`	`83`	`test $example_sha1 = $(git hash-object --stdin < example)`
`84`	`84`	`'`
`85`	`85`
`86`	`86`	`test_blob_does_not_exist $example_sha1`
`87`	`87`
`88`		`-test_expect_success 'hash a file and write to database' '`
	`88`	`+test_expect_success SHA1 'hash a file and write to database' '`
`89`	`89`	`test $hello_sha1 = $(git hash-object -w hello)`
`90`	`90`	`'`
`91`	`91`
`@@ -161,7 +161,7 @@ pop_repo`
`161`	`161`	`for args in "-w --stdin" "--stdin -w"; do`
`162`	`162`	`push_repo`
`163`	`163`
`164`		`- test_expect_success "hash from stdin and write to database ($args)" '`
	`164`	`+ test_expect_success SHA1 "hash from stdin and write to database ($args)" '`
`165`	`165`	`test $example_sha1 = $(git hash-object $args < example)`
`166`	`166`	`'`
`167`	`167`
`@@ -176,14 +176,14 @@ example"`
`176`	`176`	`sha1s="$hello_sha1`
`177`	`177`	`$example_sha1"`
`178`	`178`
`179`		`-test_expect_success "hash two files with names on stdin" '`
	`179`	`+test_expect_success SHA1 "hash two files with names on stdin" '`
`180`	`180`	`test "$sha1s" = "$(echo_without_newline "$filenames" \| git hash-object --stdin-paths)"`
`181`	`181`	`'`
`182`	`182`
`183`	`183`	`for args in "-w --stdin-paths" "--stdin-paths -w"; do`
`184`	`184`	`push_repo`
`185`	`185`
`186`		`- test_expect_success "hash two files with names on stdin and write to database ($args)" '`
	`186`	`+ test_expect_success SHA1 "hash two files with names on stdin and write to database ($args)" '`
`187`	`187`	`test "$sha1s" = "$(echo_without_newline "$filenames" \| git hash-object $args)"`
`188`	`188`	`'`
`189`	`189`