diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2021-08-11 23:16:44 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-12 05:24:32 (GMT) |
| commit | b227bead4d8fb6e75b5c58ba511c7e935b09b24b (patch) | |
| tree | 4a9425992ffb2818a667b192a3d535cf096ecbf6 /t/t5607-clone-bundle.sh | |
| parent | 5d213e46bb7b880238ff5ea3914e940a50ae9369 (diff) | |
| download | git-b227bead4d8fb6e75b5c58ba511c7e935b09b24b.zip git-b227bead4d8fb6e75b5c58ba511c7e935b09b24b.tar.gz git-b227bead4d8fb6e75b5c58ba511c7e935b09b24b.tar.bz2 | |
t5607: avoid using prerequisites to select algorithm
In this test, we currently use the SHA1 prerequisite to specify the
algorithm we're using to test, since SHA-256 bundles are always v3,
whereas SHA-1 bundles default to v2, and as a result the default output
differs.
However, this causes a problem if we run with GIT_TEST_FAIL_PREREQS set,
since that means that we'll unexpectedly fail the SHA1 prerequisite,
resulting in incorrect expected output. Let's fix this by checking
against the built-in data called "algo", which tells us which algorithm
is in use. This should work in any situation, making our test a little
more robust.
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5607-clone-bundle.sh')
| -rwxr-xr-x | t/t5607-clone-bundle.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh index ed0d911..51705aa 100755 --- a/t/t5607-clone-bundle.sh +++ b/t/t5607-clone-bundle.sh @@ -91,7 +91,8 @@ test_expect_success 'ridiculously long subject in boundary' ' git fetch long-subject-bundle.bdl && - if ! test_have_prereq SHA1 + algo=$(test_oid algo) && + if test "$algo" != sha1 then echo "@object-format=sha256" fi >expect && @@ -100,7 +101,7 @@ test_expect_success 'ridiculously long subject in boundary' ' $(git rev-parse HEAD) HEAD EOF - if test_have_prereq SHA1 + if test "$algo" = sha1 then head -n 3 long-subject-bundle.bdl else |