t5500: prettify non-commit tag tests

We don't need to use backslash continuation, as the "&&"
already provides continuation (and happily soaks up empty
lines between commands).

We can also expand the multi-line printf into a
here-document, which lets us use line breaks more naturally
(and avoids another continuation that required us to break
the natural indentation).

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2018-07-03 12:55:19 -04:00 committed by Junio C Hamano
parent c12c9df527
commit 5e834a4f39

View file

@ -533,19 +533,26 @@ test_expect_success 'test --all wrt tag to non-commits' '
# are reachable only via created tag references. # are reachable only via created tag references.
blob=$(echo "hello blob" | git hash-object -t blob -w --stdin) && blob=$(echo "hello blob" | git hash-object -t blob -w --stdin) &&
git tag -a -m "tag -> blob" tag-to-blob $blob && git tag -a -m "tag -> blob" tag-to-blob $blob &&
\
tree=$(printf "100644 blob $blob\tfile" | git mktree) && tree=$(printf "100644 blob $blob\tfile" | git mktree) &&
git tag -a -m "tag -> tree" tag-to-tree $tree && git tag -a -m "tag -> tree" tag-to-tree $tree &&
\
tree2=$(printf "100644 blob $blob\tfile2" | git mktree) && tree2=$(printf "100644 blob $blob\tfile2" | git mktree) &&
commit=$(git commit-tree -m "hello commit" $tree) && commit=$(git commit-tree -m "hello commit" $tree) &&
git tag -a -m "tag -> commit" tag-to-commit $commit && git tag -a -m "tag -> commit" tag-to-commit $commit &&
\
blob2=$(echo "hello blob2" | git hash-object -t blob -w --stdin) && blob2=$(echo "hello blob2" | git hash-object -t blob -w --stdin) &&
tag=$(printf "object $blob2\ntype blob\ntag tag-to-blob2\n\ tag=$(git mktag <<-EOF
tagger author A U Thor <author@example.com> 0 +0000\n\nhello tag" | git mktag) && object $blob2
type blob
tag tag-to-blob2
tagger author A U Thor <author@example.com> 0 +0000
hello tag
EOF
) &&
git tag -a -m "tag -> tag" tag-to-tag $tag && git tag -a -m "tag -> tag" tag-to-tag $tag &&
\
# `fetch-pack --all` should succeed fetching all those objects. # `fetch-pack --all` should succeed fetching all those objects.
mkdir fetchall && mkdir fetchall &&
( (