Merge branch 'rs/preserve-merges-unused-code-removal'

[thirdparty/git.git] / t / t5702-protocol-v2.sh

diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index 1b54c35b01792f85e791f6d4614f25d543c47dfd..5a60fbe3edb3b00ad61995ab7dee309777d6ba3e 100755 (executable)
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -13,7 +13,6 @@ start_git_daemon --export-all --enable=receive-pack
 daemon_parent=$GIT_DAEMON_DOCUMENT_ROOT_PATH/parent
 
 test_expect_success 'create repo to be served by git-daemon' '
-       test_oid_init &&
        git init "$daemon_parent" &&
        test_commit -C "$daemon_parent" one
 '
@@ -829,7 +828,7 @@ test_expect_success 'part of packfile response provided as URI' '
        # Ensure that my-blob and other-blob are in separate packfiles.
        for idx in http_child/.git/objects/pack/*.idx
        do
-               git verify-pack --verbose $idx >out &&
+               git verify-pack --object-format=$(test_oid algo) --verbose $idx >out &&
                {
                        grep "^[0-9a-f]\{16,\} " out || :
                } >out.objectlist &&