kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

t1006: update 'run_tests' to test generic object specifiers 

Update the 'run_tests' test wrapper so that the first argument may refer to
any specifier that uniquely identifies an object (e.g. a ref name,
'<OID>:<path>', '<OID>^{<type>}', etc.), rather than only a full object ID.

Also add tests that use non-OID identifiers, ensuring appropriate parsing in
'cat-file'. The identifiers used in some of the added tests include a space,
which is incompatible with the '%(rest)' atom. To accommodate that without
removing the test case, use 'test_expect_failure' when 'object_name'
includes a space.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
main
Victoria Dye 2025-06-02 18:55:53 +00:00 committed by Junio C Hamano
parent 0bd2d791cc
commit 9fd38038b9
1 changed files with 36 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
t/t1006-cat-file.sh
View File

@ -113,53 +113,54 @@ strlen () {


run_tests () { run_tests () {
type=$1 type=$1
oid=$2 object_name="$2"
size=$3 size=$3
content=$4 content=$4
pretty_content=$5 pretty_content=$5
oid=${6:-"$object_name"}


batch_output="$oid $type $size batch_output="$oid $type $size
$content" $content"


test_expect_success "$type exists" ' test_expect_success "$type exists" '
git cat-file -e $oid git cat-file -e "$object_name"
' '


test_expect_success "Type of $type is correct" ' test_expect_success "Type of $type is correct" '
echo $type >expect && echo $type >expect &&
git cat-file -t $oid >actual && git cat-file -t "$object_name" >actual &&
test_cmp expect actual test_cmp expect actual
' '


test_expect_success "Size of $type is correct" ' test_expect_success "Size of $type is correct" '
echo $size >expect && echo $size >expect &&
git cat-file -s $oid >actual && git cat-file -s "$object_name" >actual &&
test_cmp expect actual test_cmp expect actual
' '


test -z "$content" || test -z "$content" ||
test_expect_success "Content of $type is correct" ' test_expect_success "Content of $type is correct" '
echo_without_newline "$content" >expect && echo_without_newline "$content" >expect &&
git cat-file $type $oid >actual && git cat-file $type "$object_name" >actual &&
test_cmp expect actual test_cmp expect actual
' '


test_expect_success "Pretty content of $type is correct" ' test_expect_success "Pretty content of $type is correct" '
echo_without_newline "$pretty_content" >expect && echo_without_newline "$pretty_content" >expect &&
git cat-file -p $oid >actual && git cat-file -p "$object_name" >actual &&
test_cmp expect actual test_cmp expect actual
' '


test -z "$content" || test -z "$content" ||
test_expect_success "--batch output of $type is correct" ' test_expect_success "--batch output of $type is correct" '
echo "$batch_output" >expect && echo "$batch_output" >expect &&
echo $oid | git cat-file --batch >actual && echo "$object_name" | git cat-file --batch >actual &&
test_cmp expect actual test_cmp expect actual
' '


test_expect_success "--batch-check output of $type is correct" ' test_expect_success "--batch-check output of $type is correct" '
echo "$oid $type $size" >expect && echo "$oid $type $size" >expect &&
echo_without_newline $oid | git cat-file --batch-check >actual && echo_without_newline "$object_name" | git cat-file --batch-check >actual &&
test_cmp expect actual test_cmp expect actual
' '


@ -168,13 +169,13 @@ $content"
test -z "$content" || test -z "$content" ||
test_expect_success "--batch-command $opt output of $type content is correct" ' test_expect_success "--batch-command $opt output of $type content is correct" '
echo "$batch_output" >expect && echo "$batch_output" >expect &&
test_write_lines "contents $oid" | git cat-file --batch-command $opt >actual && test_write_lines "contents $object_name" | git cat-file --batch-command $opt >actual &&
test_cmp expect actual test_cmp expect actual
' '


test_expect_success "--batch-command $opt output of $type info is correct" ' test_expect_success "--batch-command $opt output of $type info is correct" '
echo "$oid $type $size" >expect && echo "$oid $type $size" >expect &&
test_write_lines "info $oid" | test_write_lines "info $object_name" |
git cat-file --batch-command $opt >actual && git cat-file --batch-command $opt >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -182,19 +183,28 @@ $content"


test_expect_success "custom --batch-check format" ' test_expect_success "custom --batch-check format" '
echo "$type $oid" >expect && echo "$type $oid" >expect &&
echo $oid | git cat-file --batch-check="%(objecttype) %(objectname)" >actual && echo "$object_name" | git cat-file --batch-check="%(objecttype) %(objectname)" >actual &&
test_cmp expect actual test_cmp expect actual
' '


test_expect_success "custom --batch-command format" ' test_expect_success "custom --batch-command format" '
echo "$type $oid" >expect && echo "$type $oid" >expect &&
echo "info $oid" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual && echo "info $object_name" | git cat-file --batch-command="%(objecttype) %(objectname)" >actual &&
test_cmp expect actual test_cmp expect actual
' '


test_expect_success '--batch-check with %(rest)' ' # FIXME: %(rest) is incompatible with object names that include whitespace,
# e.g. HEAD:path/to/a/file with spaces. Use the resolved OID as input to
# test this instead of the raw object name.
if echo "$object_name" | grep " "; then
test_rest=test_expect_failure
else
test_rest=test_expect_success
fi

$test_rest '--batch-check with %(rest)' '
echo "$type this is some extra content" >expect && echo "$type this is some extra content" >expect &&
echo "$oid this is some extra content" | echo "$object_name this is some extra content" |
git cat-file --batch-check="%(objecttype) %(rest)" >actual && git cat-file --batch-check="%(objecttype) %(rest)" >actual &&
test_cmp expect actual test_cmp expect actual
' '
@ -205,7 +215,7 @@ $content"
echo "$size" && echo "$size" &&
echo "$content" echo "$content"
} >expect && } >expect &&
echo $oid | git cat-file --batch="%(objectsize)" >actual && echo "$object_name" | git cat-file --batch="%(objectsize)" >actual &&
test_cmp expect actual test_cmp expect actual
' '


@ -215,7 +225,7 @@ $content"
echo "$type" && echo "$type" &&
echo "$content" echo "$content"
} >expect && } >expect &&
echo $oid | git cat-file --batch="%(objecttype)" >actual && echo "$object_name" | git cat-file --batch="%(objecttype)" >actual &&
test_cmp expect actual test_cmp expect actual
' '
} }
@ -230,6 +240,8 @@ test_expect_success "setup" '
git config extensions.compatobjectformat $test_compat_hash_algo && git config extensions.compatobjectformat $test_compat_hash_algo &&
echo_without_newline "$hello_content" > hello && echo_without_newline "$hello_content" > hello &&
git update-index --add hello && git update-index --add hello &&
echo_without_newline "$hello_content" > "path with spaces" &&
git update-index --add --chmod=+x "path with spaces" &&
git commit -m "add hello file" git commit -m "add hello file"
' '


@ -269,13 +281,17 @@ test_expect_success '--batch-check without %(rest) considers whole line' '


tree_oid=$(git write-tree) tree_oid=$(git write-tree)
tree_compat_oid=$(git rev-parse --output-object-format=$test_compat_hash_algo $tree_oid) tree_compat_oid=$(git rev-parse --output-object-format=$test_compat_hash_algo $tree_oid)
tree_size=$(($(test_oid rawsz) + 13)) tree_size=$((2 * $(test_oid rawsz) + 13 + 24))
tree_compat_size=$(($(test_oid --hash=compat rawsz) + 13)) tree_compat_size=$((2 * $(test_oid --hash=compat rawsz) + 13 + 24))
tree_pretty_content="100644 blob $hello_oid hello${LF}" tree_pretty_content="100644 blob $hello_oid hello${LF}100755 blob $hello_oid path with spaces${LF}"
tree_compat_pretty_content="100644 blob $hello_compat_oid hello${LF}" tree_compat_pretty_content="100644 blob $hello_compat_oid hello${LF}100755 blob $hello_compat_oid path with spaces${LF}"


run_tests 'tree' $tree_oid $tree_size "" "$tree_pretty_content" run_tests 'tree' $tree_oid $tree_size "" "$tree_pretty_content"
run_tests 'tree' $tree_compat_oid $tree_compat_size "" "$tree_compat_pretty_content" run_tests 'tree' $tree_compat_oid $tree_compat_size "" "$tree_compat_pretty_content"
run_tests 'blob' "$tree_oid:hello" $hello_size "" "$hello_content" $hello_oid
run_tests 'blob' "$tree_compat_oid:hello" $hello_size "" "$hello_content" $hello_compat_oid
run_tests 'blob' "$tree_oid:path with spaces" $hello_size "" "$hello_content" $hello_oid
run_tests 'blob' "$tree_compat_oid:path with spaces" $hello_size "" "$hello_content" $hello_compat_oid


commit_message="Initial commit" commit_message="Initial commit"
commit_oid=$(echo_without_newline "$commit_message" | git commit-tree $tree_oid) commit_oid=$(echo_without_newline "$commit_message" | git commit-tree $tree_oid)