mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t1007: annotate with SHA1 prerequisite

Browse Source 
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 <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
brian m. carlson
2018-05-13 02:24:17 +00:00
committed by Junio C Hamano
parent 5b9ba9bd80
commit 0fbdb52f9e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/t1007-hash-object.sh
View File

@ -9,13 +9,13 @@ echo_without_newline() {
} }
test_blob_does_not_exist() { 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_must_fail git cat-file blob $1
" "
} }
test_blob_exists() { test_blob_exists() {
test_expect_success 'blob exists in database' " test_expect_success SHA1 'blob exists in database' "
git cat-file blob $1 git cat-file blob $1
" "
} }
@ -73,19 +73,19 @@ test_expect_success "Can't use --path with --no-filters" '
push_repo push_repo
test_expect_success 'hash a file' ' test_expect_success SHA1 'hash a file' '
test $hello_sha1 = $(git hash-object hello) test $hello_sha1 = $(git hash-object hello)
' '
test_blob_does_not_exist $hello_sha1 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 $example_sha1 = $(git hash-object --stdin < example)
' '
test_blob_does_not_exist $example_sha1 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) test $hello_sha1 = $(git hash-object -w hello)
' '
@ -161,7 +161,7 @@ pop_repo
for args in "-w --stdin" "--stdin -w"; do for args in "-w --stdin" "--stdin -w"; do
push_repo 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) test $example_sha1 = $(git hash-object $args < example)
' '
@ -176,14 +176,14 @@ example"
sha1s="$hello_sha1 sha1s="$hello_sha1
$example_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)" test "$sha1s" = "$(echo_without_newline "$filenames" | git hash-object --stdin-paths)"
' '
for args in "-w --stdin-paths" "--stdin-paths -w"; do for args in "-w --stdin-paths" "--stdin-paths -w"; do
push_repo 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)" test "$sha1s" = "$(echo_without_newline "$filenames" | git hash-object $args)"
' '