[PATCH] t5500: prettify non-commit tag tests

Jeff King· Jul 3, 2018, 16:55 UTC · lore

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>
---
I had prepared this as a squash-in for what became c12c9df527, but since
that's now in master, it can go on top (or get dropped, but I think it
is worth it as a style fixup).

 t/t5500-fetch-pack.sh | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

Show changes to t/t5500-fetch-pack.sh +13 −6

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

-- 
2.18.0.359.ge51c883f96

Taylor Blau· Jul 3, 2018, 18:25 UTC · re: Jeff King · lore

Re: [PATCH] t5500: prettify non-commit tag tests

On Tue, Jul 03, 2018 at 12:55:19PM -0400, Jeff King wrote:

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

OK. That seems correct according to my recollection.

> 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).

The patch below seems obviously correct to me, for what my $.02 is worth :-).

> Signed-off-by: Jeff King <peff@peff.net>

Thanks, Taylor

Kirill Smelkov· Jul 4, 2018, 06:23 UTC · re: Jeff King · lore

Re: [PATCH] t5500: prettify non-commit tag tests

On Tue, Jul 03, 2018 at 12:55:19PM -0400, Jeff King wrote:

> I had prepared this as a squash-in for what became c12c9df527, but since
> that's now in master, it can go on top (or get dropped, but I think it
> is worth it as a style fixup).

I'm ok with the patch. I thought it was already squashed in into my version, but maybe it got lost.

Thanks for this prettification.

Kirill

patcht5500: prettify non-commit tag tests