summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-07-24 21:50:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-07-24 21:50:46 (GMT)
commit49b46fde9f74b720fe3bc552caba55f6c1c3a0b1 (patch)
tree4d7ed2abb6f572a3d6642e56ba28dc7279bd3279
parentf72fd3106391be86b8e86d8ba1b104ef88482dbc (diff)
parent5e834a4f3989d1996d9c394890b7227d5a249a44 (diff)
downloadgit-49b46fde9f74b720fe3bc552caba55f6c1c3a0b1.zip
git-49b46fde9f74b720fe3bc552caba55f6c1c3a0b1.tar.gz
git-49b46fde9f74b720fe3bc552caba55f6c1c3a0b1.tar.bz2
Merge branch 'jk/fetch-all-peeled-fix'
Test modernization. * jk/fetch-all-peeled-fix: t5500: prettify non-commit tag tests
-rwxr-xr-xt/t5500-fetch-pack.sh19
1 files changed, 13 insertions, 6 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index ea6570e..3d33ab3 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 &&
(