t5703: use object-format serve option

When we're using an algorithm other than SHA-1, we need to specify the
algorithm in use so we don't get a failure with an "unknown format"
message. Add a wrapper function that specifies this header if required.
Skip specifying this header for SHA-1 to test that it works both with an
without this header.

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

diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index a34460f7d82ea0ce894dab17ad3b6a7f7765b408..afe7f7f91942c34f731729b7ede3f3740a0bdfcb 100755 (executable)
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -27,6 +27,15 @@ check_output () {
        test_cmp sorted_commits actual_commits
 }
 
+write_command () {
+       echo "command=$1"
+
+       if test "$(test_oid algo)" != sha1
+       then
+               echo "object-format=$(test_oid algo)"
+       fi
+}
+
 # c(o/foo) d(o/bar)
 #        \ /
 #         b   e(baz)  f(master)
@@ -62,7 +71,7 @@ test_expect_success 'config controls ref-in-want advertisement' '
 
 test_expect_success 'invalid want-ref line' '
        test-tool pkt-line pack >in <<-EOF &&
-       command=fetch
+       $(write_command fetch)
        0001
        no-progress
        want-ref refs/heads/non-existent
@@ -83,7 +92,7 @@ test_expect_success 'basic want-ref' '
 
        oid=$(git rev-parse a) &&
        test-tool pkt-line pack >in <<-EOF &&
-       command=fetch
+       $(write_command fetch)
        0001
        no-progress
        want-ref refs/heads/master
@@ -107,7 +116,7 @@ test_expect_success 'multiple want-ref lines' '
 
        oid=$(git rev-parse b) &&
        test-tool pkt-line pack >in <<-EOF &&
-       command=fetch
+       $(write_command fetch)
        0001
        no-progress
        want-ref refs/heads/o/foo
@@ -129,7 +138,7 @@ test_expect_success 'mix want and want-ref' '
        git rev-parse e f >expected_commits &&
 
        test-tool pkt-line pack >in <<-EOF &&
-       command=fetch
+       $(write_command fetch)
        0001
        no-progress
        want-ref refs/heads/master
@@ -152,7 +161,7 @@ test_expect_success 'want-ref with ref we already have commit for' '
 
        oid=$(git rev-parse c) &&
        test-tool pkt-line pack >in <<-EOF &&
-       command=fetch
+       $(write_command fetch)
        0001
        no-progress
        want-ref refs/heads/o/foo