repo-settings: fix error handling for unknown values

newren · gitster · commit a9a136c23223 · 2022-02-02T09:36:17.000-08:00
In commit af3a67d ("negotiator: unknown fetch.negotiationAlgorithm should error out", 2018-08-01), error handling for an unknown fetch.negotiationAlgorithm was added with the code die()ing. This was also added to the documentation for the fetch.negotiationAlgorithm option, to make it explicit that the code would die on unknown values. This behavior was lost with commit aaf633c ("repo-settings: create feature.experimental setting", 2019-08-13). Restore it so that the behavior again matches the documentation. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/repo-settings.c b/repo-settings.c
@@ -84,6 +84,8 @@ void prepare_repo_settings(struct repository *r)
 			r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_NOOP;
 		else if (!strcasecmp(strval, "default"))
 			r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;
+		else
+			die("unknown fetch negotiation algorithm '%s'", strval);
 	}
 
 	/*
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
@@ -971,6 +971,13 @@ test_expect_success 'same as last but with config overrides' '
 		-c fetch.negotiationAlgorithm=default
 '
 
+test_expect_success 'ensure bogus fetch.negotiationAlgorithm yields error' '
+	test_when_finished rm -rf clientv0 &&
+	cp -r client clientv0 &&
+	test_must_fail git -C clientv0 --fetch.negotiationAlgorithm=bogus \
+		       fetch origin server_has both_have_2
+'
+
 test_expect_success 'filtering by size' '
 	rm -rf server client &&
 	test_create_repo server &&

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ void prepare_repo_settings(struct repository *r)`
`84`	`84`	`r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_NOOP;`
`85`	`85`	`else if (!strcasecmp(strval, "default"))`
`86`	`86`	`r->settings.fetch_negotiation_algorithm = FETCH_NEGOTIATION_DEFAULT;`
	`87`	`+ else`
	`88`	`+ die("unknown fetch negotiation algorithm '%s'", strval);`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`/*`