]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'en/fetch-negotiation-default-fix'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2022 23:14:30 +0000 (15:14 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Feb 2022 23:14:30 +0000 (15:14 -0800)
Interaction between fetch.negotiationAlgorithm and
feature.experimental configuration variables has been corrected.

* en/fetch-negotiation-default-fix:
  repo-settings: rename the traditional default fetch.negotiationAlgorithm
  repo-settings: fix error handling for unknown values
  repo-settings: fix checking for fetch.negotiationAlgorithm=default

1  2 
repo-settings.c
repository.h
t/t5500-fetch-pack.sh

diff --cc repo-settings.c
Simple merge
diff --cc repository.h
Simple merge
Simple merge