diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
commit | f4f8dfe127918241c1e3448436d32a89f13fa5a8 (patch) | |
tree | 7da8889b7333a7744024f53192f397f68b5b9761 /t/t5552-skipping-fetch-negotiator.sh | |
parent | Merge branch 'jk/eoo' (diff) | |
parent | repo-settings: create feature.experimental setting (diff) | |
download | tgif-f4f8dfe127918241c1e3448436d32a89f13fa5a8.tar.xz |
Merge branch 'ds/feature-macros'
A mechanism to affect the default setting for a (related) group of
configuration variables is introduced.
* ds/feature-macros:
repo-settings: create feature.experimental setting
repo-settings: create feature.manyFiles setting
repo-settings: parse core.untrackedCache
commit-graph: turn on commit-graph by default
t6501: use 'git gc' in quiet mode
repo-settings: consolidate some config settings
Diffstat (limited to 't/t5552-skipping-fetch-negotiator.sh')
-rwxr-xr-x | t/t5552-skipping-fetch-negotiator.sh | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh index 8a14be51a1..f70cbcc9ca 100755 --- a/t/t5552-skipping-fetch-negotiator.sh +++ b/t/t5552-skipping-fetch-negotiator.sh @@ -60,29 +60,6 @@ test_expect_success 'commits with no parents are sent regardless of skip distanc have_not_sent c6 c4 c3 ' -test_expect_success 'unknown fetch.negotiationAlgorithm values error out' ' - rm -rf server client trace && - git init server && - test_commit -C server to_fetch && - - git init client && - test_commit -C client on_client && - git -C client checkout on_client && - - test_config -C client fetch.negotiationAlgorithm invalid && - test_must_fail git -C client fetch "$(pwd)/server" 2>err && - test_i18ngrep "unknown fetch negotiation algorithm" err && - - # Explicit "default" value - test_config -C client fetch.negotiationAlgorithm default && - git -C client -c fetch.negotiationAlgorithm=default fetch "$(pwd)/server" && - - # Implementation detail: If there is nothing to fetch, we will not error out - test_config -C client fetch.negotiationAlgorithm invalid && - git -C client fetch "$(pwd)/server" 2>err && - test_i18ngrep ! "unknown fetch negotiation algorithm" err -' - test_expect_success 'when two skips collide, favor the larger one' ' rm -rf server client trace && git init server && |