summaryrefslogtreecommitdiff
path: root/repository.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-02-16 23:14:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-16 23:14:30 (GMT)
commit70ff41ffcf93aed8198368af435b0c53fe55ed05 (patch)
tree4dad3dd2bde82a7db5e9cc5789691fabd80b7348 /repository.h
parent00e38ba6d801143a10f762d781e3e885243caa42 (diff)
parent714edc620c7ddca5d54ff148ac27da6b67217012 (diff)
downloadgit-70ff41ffcf93aed8198368af435b0c53fe55ed05.zip
git-70ff41ffcf93aed8198368af435b0c53fe55ed05.tar.gz
git-70ff41ffcf93aed8198368af435b0c53fe55ed05.tar.bz2
Merge branch 'en/fetch-negotiation-default-fix'
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
Diffstat (limited to 'repository.h')
-rw-r--r--repository.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/repository.h b/repository.h
index 2b5cf97..ca837cb 100644
--- a/repository.h
+++ b/repository.h
@@ -20,7 +20,7 @@ enum untracked_cache_setting {
};
enum fetch_negotiation_setting {
- FETCH_NEGOTIATION_DEFAULT,
+ FETCH_NEGOTIATION_CONSECUTIVE,
FETCH_NEGOTIATION_SKIPPING,
FETCH_NEGOTIATION_NOOP,
};