Skip to content

Commit 44f14a9

Browse files
steadmongitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent d311566 commit 44f14a9

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ static int git_default_i18n_config(const char *var, const char *value)
15561556
static int git_default_branch_config(const char *var, const char *value)
15571557
{
15581558
if (!strcmp(var, "branch.autosetupmerge")) {
1559-
if (value && !strcasecmp(value, "always")) {
1559+
if (value && !strcmp(value, "always")) {
15601560
git_branch_track = BRANCH_TRACK_ALWAYS;
15611561
return 0;
15621562
} else if (value && !strcmp(value, "inherit")) {

0 commit comments

Comments
 (0)