t5500: make hash independent

This test has hard-coded pkt-lines with object IDs.  The pkt-line
lengths necessarily differ between hash algorithms, so generate these
lines with the packetize helper so they're always the right size.  In
addition, we will require an object-format capability for SHA-256, so
pass that capability on to the upload-pack process.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 52dd1a688cd052a098586b6e1a89b2f621fdd99c..8fee99ecfb2fc9f2b64a1956272211985a3d1241 100755 (executable)
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -871,9 +871,10 @@ test_expect_success 'shallow since with commit graph and already-seen commit' '
 
        GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
        0012command=fetch
+       $(echo "object-format=$(test_oid algo)" | packetize)
        00010013deepen-since 1
-       0032want $(git rev-parse other)
-       0032have $(git rev-parse master)
+       $(echo "want $(git rev-parse other)" | packetize)
+       $(echo "have $(git rev-parse master)" | packetize)
        0000
        EOF
        )