From: Josh Steadmon <steadmon@google.com>
Date: Tue, 21 Dec 2021 03:30:24 +0000 (-0800)
Subject: config: require lowercase for branch.*.autosetupmerge
X-Git-Tag: v2.35.0-rc0~8^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44f14a9d24cd9f04a0a789e58968d52d44d7f332;p=thirdparty%2Fgit.git

config: require lowercase for branch.*.autosetupmerge

Although we only documented that branch.*.autosetupmerge would accept
"always" as a value, the actual implementation would accept any
combination of upper- or lower-case. Fix this to be consistent with
documentation and with other values of this config variable.

Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/config.c b/config.c
index 532732fc33..42940154d0 100644
--- a/config.c
+++ b/config.c
@@ -1556,7 +1556,7 @@ static int git_default_i18n_config(const char *var, const char *value)
 static int git_default_branch_config(const char *var, const char *value)
 {
 	if (!strcmp(var, "branch.autosetupmerge")) {
-		if (value && !strcasecmp(value, "always")) {
+		if (value && !strcmp(value, "always")) {
 			git_branch_track = BRANCH_TRACK_ALWAYS;
 			return 0;
 		} else if (value && !strcmp(value, "inherit")) {