diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-02-14 12:54:19 -0800 |
| commit | 0da63da7942ce810126cd54d9f72a46f3d616895 (patch) | |
| tree | 19764100be710ae2c250a13b67d0f202efc9078e /t/t5515-fetch-merge-logic.sh | |
| parent | Merge branch 'jk/packfile-reuse-cleanup' (diff) | |
| parent | fetch: default to protocol version 2 (diff) | |
| download | tgif-0da63da7942ce810126cd54d9f72a46f3d616895.tar.xz | |
Merge branch 'jn/promote-proto2-to-default'
The transport protocol version 2 becomes the default one.
* jn/promote-proto2-to-default:
fetch: default to protocol version 2
protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION
test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate
config doc: protocol.version is not experimental
fetch test: use more robust test for filtered objects
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
| -rwxr-xr-x | t/t5515-fetch-merge-logic.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh index 961eb35c99..a9a7d50d3e 100755 --- a/t/t5515-fetch-merge-logic.sh +++ b/t/t5515-fetch-merge-logic.sh @@ -8,7 +8,8 @@ test_description='Merge logic in fetch' # NEEDSWORK: If the overspecification of the expected result is reduced, we # might be able to run this test in all protocol versions. -GIT_TEST_PROTOCOL_VERSION= +GIT_TEST_PROTOCOL_VERSION=0 +export GIT_TEST_PROTOCOL_VERSION . ./test-lib.sh |