summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Josh Steadmon <steadmon@google.com>2021-12-20 19:30:24 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-12-20 22:40:21 -0800
commit44f14a9d24cd9f04a0a789e58968d52d44d7f332 (patch)
treefc90a36b89a50e4312a52f052e01ece104accf12
parentbranch: add flags and config to inherit tracking (diff)
downloadtgif-44f14a9d24cd9f04a0a789e58968d52d44d7f332.tar.xz
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>
-rw-r--r--config.c2
1 files changed, 1 insertions, 1 deletions
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")) {