* [PATCH] t5500: prettify non-commit tag tests
@ 2018-07-03 16:55 Jeff King
2018-07-03 18:25 ` Taylor Blau
2018-07-04 6:23 ` Kirill Smelkov
0 siblings, 2 replies; 3+ messages in thread
From: Jeff King @ 2018-07-03 16:55 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Kirill Smelkov
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] t5500: prettify non-commit tag tests
2018-07-03 16:55 [PATCH] t5500: prettify non-commit tag tests Jeff King
@ 2018-07-03 18:25 ` Taylor Blau
2018-07-04 6:23 ` Kirill Smelkov
1 sibling, 0 replies; 3+ messages in thread
From: Taylor Blau @ 2018-07-03 18:25 UTC (permalink / raw)
To: Jeff King; +Cc: Junio C Hamano, git, Kirill Smelkov
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] t5500: prettify non-commit tag tests
2018-07-03 16:55 [PATCH] t5500: prettify non-commit tag tests Jeff King
2018-07-03 18:25 ` Taylor Blau
@ 2018-07-04 6:23 ` Kirill Smelkov
1 sibling, 0 replies; 3+ messages in thread
From: Kirill Smelkov @ 2018-07-04 6:23 UTC (permalink / raw)
To: Jeff King; +Cc: Junio C Hamano, git
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-04 6:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-07-03 16:55 [PATCH] t5500: prettify non-commit tag tests Jeff King
2018-07-03 18:25 ` Taylor Blau
2018-07-04 6:23 ` Kirill Smelkov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.