Jeff King <peff@xxxxxxxx> writes:
> +# Write a loose object into the odb at $1, with object type $2 and contents
> +# from stdin. Writes the oid to stdout. Example:
> +#
> +# oid=$(echo foo | loose_obj .git/objects blob)
> +#
> +loose_obj () {
> + cat >tmp_loose.content &&
> + size=$(wc -c <tmp_loose.content) &&
> + {
> + # Do not quote $size here; we want the shell
> + # to strip whitespace that "wc" adds on some platforms.
> + printf "%s %s\0" "$2" $size &&
Nice to have this comment.
We probably could also do
printf "%s %d\0" "$2" "$size"
to cope with possible leading space padding, but your version makes
the intent a lot clearer.
> + cat tmp_loose.content
> + } >tmp_loose.raw &&
OK, a loose object file is a deflated bytestream of object header
followed by the payload, and because the header records the size
of the payload, we need to read the payload to its end first.
> + oid=$(test-tool $test_hash_algo <tmp_loose.raw) &&
And hashing the raw gives us the object name.
> + suffix=${oid#??} &&
> + prefix=${oid%$suffix} &&
> + dir=$1/$prefix &&
> + file=$dir/$suffix &&
OK.
> + test-tool zlib deflate <tmp_loose.raw >tmp_loose.zlib &&
> + mkdir -p "$dir" &&
> + mv tmp_loose.zlib "$file" &&
Ah, you are being very careful. As this is merely a test, we
probably could do without tmp_loose.zlib but I do not mind it being
careful.
> + rm tmp_loose.raw tmp_loose.content &&
> + echo "$oid"
> +}
> diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
> index d96d02ad7d..317da6869c 100755
> --- a/t/t1006-cat-file.sh
> +++ b/t/t1006-cat-file.sh
> @@ -3,6 +3,7 @@
> test_description='git cat-file'
>
> . ./test-lib.sh
> +. "$TEST_DIRECTORY/lib-loose.sh"
>
> test_cmdmode_usage () {
> test_expect_code 129 "$@" 2>err &&
> @@ -657,12 +658,12 @@ test_expect_success 'setup bogus data' '
> bogus_short_type="bogus" &&
> bogus_short_content="bogus" &&
> bogus_short_size=$(strlen "$bogus_short_content") &&
> - bogus_short_oid=$(echo_without_newline "$bogus_short_content" | git hash-object -t $bogus_short_type --literally -w --stdin) &&
> + bogus_short_oid=$(echo_without_newline "$bogus_short_content" | loose_obj .git/objects $bogus_short_type) &&
>
> bogus_long_type="abcdefghijklmnopqrstuvwxyz1234679" &&
> bogus_long_content="bogus" &&
> bogus_long_size=$(strlen "$bogus_long_content") &&
> - bogus_long_oid=$(echo_without_newline "$bogus_long_content" | git hash-object -t $bogus_long_type --literally -w --stdin)
> + bogus_long_oid=$(echo_without_newline "$bogus_long_content" | loose_obj .git/objects $bogus_long_type)
> '
Nice.
