mirror of
https://github.com/git-for-windows/git.git
synced 2026-05-04 19:16:21 -05:00
Merge branch 'bc/t5607-avoid-broken-test-fail-prereqs'
The current implementation of GIT_TEST_FAIL_PREREQS is broken in that checking for the lack of a prerequisite would not work. Avoid the use of "if ! test_have_prereq X" in a test script. * bc/t5607-avoid-broken-test-fail-prereqs: t5607: avoid using prerequisites to select algorithm
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user