aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2026-02-05 15:42:01 -0800
committerJunio C Hamano <gitster@pobox.com>2026-02-05 15:42:01 -0800
commit96614e799ca044376f717745dd48d6d4a3da84e9 (patch)
treed679d8fbb729e1bfd417761189d9f3af2c25bbff
parent7758f84682eb248b8738ea5d9b72e60864fa2ee0 (diff)
parenta824421d3644f39bfa8dfc75876db8ed1c7bcdbf (diff)
downloadgit-96614e799ca044376f717745dd48d6d4a3da84e9.tar.xz
Merge branch 'sp/t5500-cleanup'
Test clean-up. * sp/t5500-cleanup: t5500: simplify test implementation and fix git exit code suppression
-rwxr-xr-xt/t5500-fetch-pack.sh17
1 files changed, 11 insertions, 6 deletions
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 2677cd5faa..4bb56c167a 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -892,15 +892,20 @@ test_expect_success 'shallow since with commit graph and already-seen commit' '
test_commit other &&
git commit-graph write --reachable &&
git config core.commitGraph true &&
+ oid_algo=$(test_oid algo) &&
+ oid_other=$(git rev-parse other) &&
+ oid_main=$(git rev-parse main) &&
- GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
- 0012command=fetch
- $(echo "object-format=$(test_oid algo)" | packetize)
- 00010013deepen-since 1
- $(echo "want $(git rev-parse other)" | packetize)
- $(echo "have $(git rev-parse main)" | packetize)
+ test-tool pkt-line pack >input <<-EOF &&
+ command=fetch
+ object-format=$oid_algo
+ 0001
+ deepen-since 1
+ want $oid_other
+ have $oid_main
0000
EOF
+ GIT_PROTOCOL=version=2 git upload-pack . <input >/dev/null
)
'