[PATCH v6 3/3] config: require lowercase for branch.autosetupmerge
- From
Josh Steadmon <steadmon@google.com>
- Date
- Dec 14, 2021, 23:44 UTC
- Message-ID
- <f79d27dc243dee281b879e358e8609aba39b3fe3.1639524556.git.steadmon@google.com>
- In-Reply-To
- <cover.1639524556.git.steadmon@google.com>
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> --- config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/config.c b/config.c index 152c94f29d..54c0e7d98e 100644 --- a/config.c +++ b/config.c @@ -1577,7 +1577,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")) {
-- 2.34.1.173.g76aa8bc2d0-goog